address review

Author: b-naber

compiler/rustc_resolve/src/diagnostics.rs

@@ -1076,9 +1076,12 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                         }
                     }
                 }
-                Scope::NonGlobModule(module, _) | Scope::GlobModule(module, _) => {
+                Scope::NonGlobModule(module, _) => {
                     this.add_module_candidates(module, &mut suggestions, filter_fn, None);
                 }
+                Scope::GlobModule(..) => {
+                    // already inserted in `Scope::NonGlobModule` arm
+                }
                 Scope::MacroUsePrelude => {
                     suggestions.extend(this.macro_use_prelude.iter().filter_map(
                         |(name, binding)| {
@@ -1485,9 +1488,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             &parent_scope,
             ident.span.ctxt(),
             |this, scope, _use_prelude, _ctxt| {
-                let m = match scope {
-                    Scope::NonGlobModule(module, _) | Scope::GlobModule(module, _) => module,
-                    _ => return None,
+                let (Scope::NonGlobModule(m, _) | Scope::GlobModule(m, _)) = scope else {
+                    return None;
                 };
 
                 for (_, resolution) in this.resolutions(m).borrow().iter() {

compiler/rustc_resolve/src/ident.rs

@@ -191,15 +191,13 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                     }
                     MacroRulesScope::Empty => Scope::NonGlobModule(module, None),
                 },
-                Scope::NonGlobModule(..) | Scope::GlobModule(..) if module_and_extern_prelude => {
-                    match ns {
-                        TypeNS => {
-                            ctxt.adjust(ExpnId::root());
-                            Scope::ExternPrelude
-                        }
-                        ValueNS | MacroNS => break,
+                Scope::GlobModule(..) if module_and_extern_prelude => match ns {
+                    TypeNS => {
+                        ctxt.adjust(ExpnId::root());
+                        Scope::ExternPrelude
                     }
-                }
+                    ValueNS | MacroNS => break,
+                },
                 Scope::NonGlobModule(module, prev_lint_id) => {
                     use_prelude = !module.no_implicit_prelude;
                     Scope::GlobModule(module, prev_lint_id)
@@ -742,7 +740,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                                     )
                                     || flags.contains(Flags::MACRO_RULES)
                                         && (innermost_flags.contains(Flags::NON_GLOB_MODULE)
-                                            || flags.contains(Flags::GLOB_MODULE))
+                                            || innermost_flags.contains(Flags::GLOB_MODULE))
                                         && !this.disambiguate_macro_rules_vs_modularized(
                                             binding,
                                             innermost_binding,

compiler/rustc_resolve/src/lib.rs

@@ -1879,17 +1879,13 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             }
         }
 
-        let mut non_glob_module_inserted = false;
         self.cm().visit_scopes(ScopeSet::All(TypeNS), parent_scope, ctxt, |this, scope, _, _| {
             match scope {
                 Scope::NonGlobModule(module, _) => {
                     this.get_mut().traits_in_module(module, assoc_item, &mut found_traits);
-                    non_glob_module_inserted = true;
                 }
-                Scope::GlobModule(module, _) => {
-                    if !non_glob_module_inserted {
-                        this.get_mut().traits_in_module(module, assoc_item, &mut found_traits);
-                    }
+                Scope::GlobModule(..) => {
+                    // already inserted in `Scope::NonGlobModule` arm
                 }
                 Scope::StdLibPrelude => {
                     if let Some(module) = this.prelude {