Skip to content

Commit f1097bc

Browse files
committed
introduce Scope::NonGlobModule and Scope::GlobModule
1 parent 6c0a912 commit f1097bc

File tree

3 files changed

+363
-114
lines changed

3 files changed

+363
-114
lines changed

compiler/rustc_resolve/src/diagnostics.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
10811081
let root_module = this.resolve_crate_root(root_ident);
10821082
this.add_module_candidates(root_module, &mut suggestions, filter_fn, None);
10831083
}
1084-
Scope::Module(module, _) => {
1084+
Scope::NonGlobModule(module, _) | Scope::GlobModule(module, _) => {
10851085
this.add_module_candidates(module, &mut suggestions, filter_fn, None);
10861086
}
10871087
Scope::MacroUsePrelude => {
@@ -1491,9 +1491,11 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
14911491
&parent_scope,
14921492
ident.span.ctxt(),
14931493
|this, scope, _use_prelude, _ctxt| {
1494-
let Scope::Module(m, _) = scope else {
1495-
return None;
1494+
let m = match scope {
1495+
Scope::NonGlobModule(module, _) | Scope::GlobModule(module, _) => module,
1496+
_ => return None,
14961497
};
1498+
14971499
for (_, resolution) in this.resolutions(m).borrow().iter() {
14981500
let Some(binding) = resolution.borrow().best_binding() else {
14991501
continue;

0 commit comments

Comments
 (0)