address review

Author: LorrensP-2158466

compiler/rustc_resolve/src/check_unused.rs

@@ -511,7 +511,7 @@ impl Resolver<'_, '_> {
             for (_key, resolution) in self.resolutions(*module).borrow().iter() {
                 let resolution = resolution.borrow();
 
-                if let Some(binding) = resolution.late_binding()
+                if let Some(binding) = resolution.best_binding()
                     && let NameBindingKind::Import { import, .. } = binding.kind
                     && let ImportKind::Single { id, .. } = import.kind
                 {

compiler/rustc_resolve/src/diagnostics.rs

@@ -1440,7 +1440,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                         |(key, name_resolution)| {
                             if key.ns == TypeNS
                                 && key.ident == ident
-                                && let Some(binding) = name_resolution.borrow().late_binding()
+                                && let Some(binding) = name_resolution.borrow().best_binding()
                             {
                                 match binding.res() {
                                     // No disambiguation needed if the identically named item we
@@ -1494,7 +1494,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                     return None;
                 };
                 for (_, resolution) in this.resolutions(m).borrow().iter() {
-                    let Some(binding) = resolution.borrow().late_binding() else {
+                    let Some(binding) = resolution.borrow().best_binding() else {
                         continue;
                     };
                     let Res::Def(DefKind::Macro(MacroKind::Derive | MacroKind::Attr), def_id) =

compiler/rustc_resolve/src/ident.rs

@@ -883,7 +883,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             return self.finalize_module_binding(
                 ident,
                 binding,
-                resolution.glob_binding,
+                if resolution.non_glob_binding.is_some() { resolution.glob_binding } else { None },
                 parent_scope,
                 finalize,
                 shadowing,

compiler/rustc_resolve/src/imports.rs

@@ -251,7 +251,7 @@ pub(crate) struct NameResolution<'ra> {
 impl<'ra> NameResolution<'ra> {
     /// Returns the binding for the name if it is known or None if it not known.
     pub(crate) fn binding(&self) -> Option<NameBinding<'ra>> {
-        self.late_binding().and_then(|binding| {
+        self.best_binding().and_then(|binding| {
             if !binding.is_glob_import() || self.single_imports.is_empty() {
                 Some(binding)
             } else {
@@ -260,7 +260,7 @@ impl<'ra> NameResolution<'ra> {
         })
     }
 
-    pub(crate) fn late_binding(&self) -> Option<NameBinding<'ra>> {
+    pub(crate) fn best_binding(&self) -> Option<NameBinding<'ra>> {
         self.non_glob_binding.or(self.glob_binding)
     }
 }
@@ -343,7 +343,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         self.check_reserved_macro_name(key.ident, res);
         self.set_binding_parent_module(binding, module);
         self.update_resolution(module, key, warn_ambiguity, |this, resolution| {
-            if let Some(old_binding) = resolution.late_binding() {
+            if let Some(old_binding) = resolution.best_binding() {
                 if res == Res::Err && old_binding.res() != Res::Err {
                     // Do not override real bindings with `Res::Err`s from error recovery.
                     return Ok(());
@@ -394,16 +394,16 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                             resolution.non_glob_binding = Some(non_glob_binding);
                         }
 
-                        if let Some(old_glob) = resolution.glob_binding {
-                            assert!(old_glob.is_glob_import());
-                            if glob_binding.res() != old_glob.res() {
+                        if let Some(old_glob_binding) = resolution.glob_binding {
+                            assert!(old_glob_binding.is_glob_import());
+                            if glob_binding.res() != old_glob_binding.res() {
                                 resolution.glob_binding = Some(this.new_ambiguity_binding(
                                     AmbiguityKind::GlobVsGlob,
-                                    old_glob,
+                                    old_glob_binding,
                                     glob_binding,
                                     false,
                                 ));
-                            } else if !old_glob.vis.is_at_least(binding.vis, this.tcx) {
+                            } else if !old_glob_binding.vis.is_at_least(binding.vis, this.tcx) {
                                 resolution.glob_binding = Some(glob_binding);
                             }
                         } else {
@@ -639,7 +639,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             for (key, resolution) in self.resolutions(*module).borrow().iter() {
                 let resolution = resolution.borrow();
 
-                let Some(binding) = resolution.late_binding() else { continue };
+                let Some(binding) = resolution.best_binding() else { continue };
 
                 if let NameBindingKind::Import { import, .. } = binding.kind
                     && let Some((amb_binding, _)) = binding.ambiguity
@@ -659,7 +659,9 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                     );
                 }
 
-                if let Some(glob_binding) = resolution.glob_binding {
+                if let Some(glob_binding) = resolution.glob_binding
+                    && resolution.non_glob_binding.is_some()
+                {
                     if binding.res() != Res::Err
                         && glob_binding.res() != Res::Err
                         && let NameBindingKind::Import { import: glob_import, .. } =
@@ -1191,7 +1193,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                         } // Never suggest the same name
                         match *resolution.borrow() {
                             ref resolution
-                                if let Some(name_binding) = resolution.late_binding() =>
+                                if let Some(name_binding) = resolution.best_binding() =>
                             {
                                 match name_binding.kind {
                                     NameBindingKind::Import { binding, .. } => {

compiler/rustc_resolve/src/late.rs

@@ -3438,7 +3438,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
         ident.span.normalize_to_macros_2_0_and_adjust(module.expansion);
         let key = BindingKey::new(ident, ns);
         let mut binding =
-            self.r.resolution(module, key).try_borrow().ok().and_then(|r| r.late_binding());
+            self.r.resolution(module, key).try_borrow().ok().and_then(|r| r.best_binding());
         debug!(?binding);
         if binding.is_none() {
             // We could not find the trait item in the correct namespace.
@@ -3450,7 +3450,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
             };
             let key = BindingKey::new(ident, ns);
             binding =
-                self.r.resolution(module, key).try_borrow().ok().and_then(|r| r.late_binding());
+                self.r.resolution(module, key).try_borrow().ok().and_then(|r| r.best_binding());
             debug!(?binding);
         }
 

compiler/rustc_resolve/src/late/diagnostics.rs

@@ -882,7 +882,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
             for resolution in r.resolutions(m).borrow().values() {
                 let Some(did) = resolution
                     .borrow()
-                    .late_binding()
+                    .best_binding()
                     .and_then(|binding| binding.res().opt_def_id())
                 else {
                     continue;
@@ -1471,7 +1471,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
                     .filter_map(|(key, resolution)| {
                         resolution
                             .borrow()
-                            .late_binding()
+                            .best_binding()
                             .map(|binding| binding.res())
                             .and_then(|res| if filter_fn(res) { Some((key, res)) } else { None })
                     })
@@ -2309,7 +2309,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
             .borrow()
             .iter()
             .filter_map(|(key, res)| {
-                res.borrow().late_binding().map(|binding| (key, binding.res()))
+                res.borrow().best_binding().map(|binding| (key, binding.res()))
             })
             .filter(|(_, res)| match (kind, res) {
                 (AssocItemKind::Const(..), Res::Def(DefKind::AssocConst, _)) => true,

compiler/rustc_resolve/src/lib.rs

@@ -641,7 +641,7 @@ impl<'ra> Module<'ra> {
         F: FnMut(&mut R, Ident, Namespace, NameBinding<'ra>),
     {
         for (key, name_resolution) in resolver.as_mut().resolutions(self).borrow().iter() {
-            if let Some(binding) = name_resolution.borrow().late_binding() {
+            if let Some(binding) = name_resolution.borrow().best_binding() {
                 f(resolver, key.ident, key.ns, binding);
             }
         }

tests/ui/imports/ambiguous-4-extern.rs

@@ -5,7 +5,7 @@
 
 macro_rules! m {
     () => {
-        pub fn id() {}
+      pub fn id() {}
     };
 }