mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle unusable_binding more compactly.

Browse source
This commit is contained in:
Vadim Petrochenkov 2022-04-12 20:18:08 +03:00 • committed by Camille GILLOT
parent b796d92da3
commit 276b946010
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
compiler/rustc_resolve/src/ident.rs
View file

@ -902,27 +902,24 @@ impl<'a> Resolver<'a> {
self.resolution(module, key).try_borrow_mut().map_err(|_| (Determined, Weak::No))?; // This happens when there is a cycle of imports.
if let Some(path_span) = finalize {
let Some(mut binding) = resolution.binding else {
return Err((Determined, Weak::No));
};
// If the primary binding is unusable, search further and return the shadowed glob
// binding if it exists. What we really want here is having two separate scopes in
// a module - one for non-globs and one for globs, but until that's done use this
// hack to avoid inconsistent resolution ICEs during import validation.
if let Some(unusable_binding) = unusable_binding
&& ptr::eq(binding, unusable_binding)
{
let Some(shadowed) = resolution.shadowed_glob else {
return Err((Determined, Weak::No));
};
if ptr::eq(shadowed, unusable_binding) {
return Err((Determined, Weak::No));
}
binding = shadowed;
}
let binding = [resolution.binding, resolution.shadowed_glob]
.into_iter()
.filter_map(|binding| match (binding, unusable_binding) {
(Some(binding), Some(unusable_binding))
if ptr::eq(binding, unusable_binding) =>
{
None
}
_ => binding,
})
.next();
let Some(binding) = binding else {
return Err((Determined, Weak::No));
};
if !self.is_accessible_from(binding.vis, parent_scope.module) {
if last_import_segment {