bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

fix(resolve): only disambiguate binding key during define

Browse source
This commit is contained in:
bohan 2023-04-18 22:46:51 +08:00
parent 24c180c438
commit 5b09810976
8 changed files with 114 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,7 @@ use crate::late::{
ConstantHasGenerics, HasGenericParams, NoConstantGenericsReason, PathSource, Rib, RibKind,
};
use crate::macros::{sub_namespace_match, MacroRulesScope};
use crate::BindingKey;
use crate::{errors, AmbiguityError, AmbiguityErrorMisc, AmbiguityKind, Determinacy, Finalize};
use crate::{Import, ImportKind, LexicalScopeBinding, Module, ModuleKind, ModuleOrUniformRoot};
use crate::{NameBinding, NameBindingKind, ParentScope, PathResult, PrivacyError, Res};
@ -865,7 +866,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
}
};
let key = self.new_key(ident, ns);
let key = BindingKey::new(ident, ns);
let resolution =
self.resolution(module, key).try_borrow_mut().map_err(|_| (Determined, Weak::No))?; // This happens when there is a cycle of imports.