Commit 4b55791

committed

resolve: Change the underscore disambiguator to avoid regressions

1 parent 67b57f6 commit 4b55791Copy full SHA for 4b55791

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {`
`350`	`350`	`// because they can be fetched by glob imports from those modules, and bring traits`
`351`	`351`	`// into scope both directly and through glob imports.`
`352`	`352`	`let key = BindingKey::new_disambiguated(ident, ns, \|\| {`
`353`		`- (module.0.0.lazy_resolutions.borrow().len() + 1).try_into().unwrap()`
	`353`	`+ module.underscore_disambiguator.update(\|d\| d + 1);`
	`354`	`+ module.underscore_disambiguator.get()`
`354`	`355`	`});`
`355`	`356`	`self.update_resolution(module, key, warn_ambiguity, \|this, resolution\| {`
`356`	`357`	`if let Some(old_binding) = resolution.best_binding() {`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -579,6 +579,8 @@ struct ModuleData<'ra> {`
`579`	`579`	`lazy_resolutions: Resolutions<'ra>,`
`580`	`580`	`/// True if this is a module from other crate that needs to be populated on access.`
`581`	`581`	`populate_on_access: Cell<bool>,`
	`582`	+ /// Used to disambiguate underscore items (`const _: T = ...`) in the module.
	`583`	`+ underscore_disambiguator: Cell<u32>,`
`582`	`584`
`583`	`585`	`/// Macro invocations that can expand into items in this module.`
`584`	`586`	`unexpanded_invocations: RefCell<FxHashSet<LocalExpnId>>,`
`@@ -639,6 +641,7 @@ impl<'ra> ModuleData<'ra> {`
`639`	`641`	`kind,`
`640`	`642`	`lazy_resolutions: Default::default(),`
`641`	`643`	`populate_on_access: Cell::new(is_foreign),`
	`644`	`+ underscore_disambiguator: Cell::new(0),`
`642`	`645`	`unexpanded_invocations: Default::default(),`
`643`	`646`	`no_implicit_prelude,`
`644`	`647`	`glob_importers: RefCell::new(Vec::new()),`

Comments

(0)