remove ignore_innermost

b-naber · b-naber · commit 6104053636b5 · 2025-08-17T08:14:44.000Z
diff --git a/compiler/rustc_resolve/src/ident.rs b/compiler/rustc_resolve/src/ident.rs
@@ -725,12 +725,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                             // Found another solution, if the first one was "weak", report an error.
                             let (res, innermost_res) = (binding.res(), innermost_binding.res());
 
-                            // don't report ambiguity errors when we have a glob resolution with a
-                            // non-glob innermost resolution.
-                            let ignore_innermost_result = flags.contains(Flags::GLOB_MODULE)
-                                && innermost_flags.contains(Flags::NON_GLOB_MODULE);
-
-                            if res != innermost_res && !ignore_innermost_result {
+                            if res != innermost_res {
                                 let is_builtin = |res| {
                                     matches!(res, Res::NonMacroAttr(NonMacroAttrKind::Builtin(..)))
                                 };
diff --git a/tests/ui/imports/import-after-macro-expand-10.rs b/tests/ui/imports/import-after-macro-expand-10.rs
@@ -1,5 +1,3 @@
-//@ check-pass
-
 mod b {
     pub mod http {
         pub struct HeaderMap;
@@ -14,4 +12,5 @@ use crate::b::*;
 
 fn main() {
     let h: crate::b::HeaderMap = HeaderMap;
+    //~^ ERROR ambiguous
 }
diff --git a/tests/ui/imports/import-after-macro-expand-10.stderr b/tests/ui/imports/import-after-macro-expand-10.stderr
@@ -0,0 +1,23 @@
+error[E0659]: `HeaderMap` is ambiguous
+  --> $DIR/import-after-macro-expand-10.rs:14:22
+   |
+LL |     let h: crate::b::HeaderMap = HeaderMap;
+   |                      ^^^^^^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `HeaderMap` could refer to the struct defined here
+  --> $DIR/import-after-macro-expand-10.rs:8:5
+   |
+LL |     pub struct HeaderMap;
+   |     ^^^^^^^^^^^^^^^^^^^^^
+   = help: use `self::HeaderMap` to refer to this struct unambiguously
+note: `HeaderMap` could also refer to the struct imported here
+  --> $DIR/import-after-macro-expand-10.rs:6:13
+   |
+LL |     pub use self::http::*;
+   |             ^^^^^^^^^^^^^
+   = help: use `self::HeaderMap` to refer to this struct unambiguously
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/imports/import-after-macro-expand-11.rs b/tests/ui/imports/import-after-macro-expand-11.rs
@@ -1,5 +1,3 @@
-//@ check-pass
-
 #[derive(Debug)]
 struct H;
 
@@ -14,6 +12,7 @@ mod p {
 
         fn f() {
            let h: crate::p::H = H;
+           //~^ ERROR ambiguous
         }
     }
 }
diff --git a/tests/ui/imports/import-after-macro-expand-11.stderr b/tests/ui/imports/import-after-macro-expand-11.stderr
@@ -0,0 +1,23 @@
+error[E0659]: `H` is ambiguous
+  --> $DIR/import-after-macro-expand-11.rs:14:29
+   |
+LL |            let h: crate::p::H = H;
+   |                             ^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `H` could refer to the struct defined here
+  --> $DIR/import-after-macro-expand-11.rs:8:5
+   |
+LL |     struct H;
+   |     ^^^^^^^^^
+   = help: use `self::H` to refer to this struct unambiguously
+note: `H` could also refer to the struct imported here
+  --> $DIR/import-after-macro-expand-11.rs:5:9
+   |
+LL |     use super::*;
+   |         ^^^^^^^^
+   = help: use `self::H` to refer to this struct unambiguously
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/imports/import-after-macro-expand-13.rs b/tests/ui/imports/import-after-macro-expand-13.rs
@@ -1,4 +1,3 @@
-//@ check-pass
 // similar as `import-after-macro-expand-6.rs`
 
 use crate::a::HeaderMap;
@@ -19,4 +18,5 @@ mod a {
 
 fn main() {
     let h: crate::b::HeaderMap = HeaderMap;
+    //~^ ERROR ambiguous
 }
diff --git a/tests/ui/imports/import-after-macro-expand-13.stderr b/tests/ui/imports/import-after-macro-expand-13.stderr
@@ -0,0 +1,23 @@
+error[E0659]: `HeaderMap` is ambiguous
+  --> $DIR/import-after-macro-expand-13.rs:20:22
+   |
+LL |     let h: crate::b::HeaderMap = HeaderMap;
+   |                      ^^^^^^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `HeaderMap` could refer to the struct defined here
+  --> $DIR/import-after-macro-expand-13.rs:12:5
+   |
+LL |     pub struct HeaderMap;
+   |     ^^^^^^^^^^^^^^^^^^^^^
+   = help: use `self::HeaderMap` to refer to this struct unambiguously
+note: `HeaderMap` could also refer to the struct imported here
+  --> $DIR/import-after-macro-expand-13.rs:10:13
+   |
+LL |     pub use self::http::*;
+   |             ^^^^^^^^^^^^^
+   = help: use `self::HeaderMap` to refer to this struct unambiguously
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/imports/import-after-macro-expand-14.rs b/tests/ui/imports/import-after-macro-expand-14.rs
@@ -1,5 +1,3 @@
-//@ check-pass
-
 use crate::a::HeaderMap;
 
 mod b {
@@ -19,4 +17,5 @@ mod a {
 
 fn main() {
     let h: crate::b::HeaderMap = HeaderMap;
+    //~^ ERROR ambiguous
 }
diff --git a/tests/ui/imports/import-after-macro-expand-14.stderr b/tests/ui/imports/import-after-macro-expand-14.stderr
@@ -0,0 +1,23 @@
+error[E0659]: `HeaderMap` is ambiguous
+  --> $DIR/import-after-macro-expand-14.rs:19:22
+   |
+LL |     let h: crate::b::HeaderMap = HeaderMap;
+   |                      ^^^^^^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `HeaderMap` could refer to the struct defined here
+  --> $DIR/import-after-macro-expand-14.rs:11:5
+   |
+LL |     pub struct HeaderMap;
+   |     ^^^^^^^^^^^^^^^^^^^^^
+   = help: use `self::HeaderMap` to refer to this struct unambiguously
+note: `HeaderMap` could also refer to the struct imported here
+  --> $DIR/import-after-macro-expand-14.rs:9:13
+   |
+LL |     pub use self::http::*;
+   |             ^^^^^^^^^^^^^
+   = help: use `self::HeaderMap` to refer to this struct unambiguously
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/imports/import-after-macro-expand-2.rs b/tests/ui/imports/import-after-macro-expand-2.rs
@@ -1,4 +1,3 @@
-//@ check-pass
 // https://github.com/rust-lang/rust/issues/56593#issuecomment-1133174514
 
 use thing::*;
@@ -13,6 +12,7 @@ mod tests {
 
     fn test_thing() {
         let thing: crate::Thing = Thing::Foo;
+        //~^ ERROR ambiguous
     }
 }
 
diff --git a/tests/ui/imports/import-after-macro-expand-2.stderr b/tests/ui/imports/import-after-macro-expand-2.stderr
@@ -0,0 +1,25 @@
+error[E0659]: `Thing` is ambiguous
+  --> $DIR/import-after-macro-expand-2.rs:14:27
+   |
+LL |         let thing: crate::Thing = Thing::Foo;
+   |                           ^^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `Thing` could refer to the enum defined here
+  --> $DIR/import-after-macro-expand-2.rs:6:1
+   |
+LL | / pub enum Thing {
+LL | |     Foo
+LL | | }
+   | |_^
+   = help: use `crate::Thing` to refer to this enum unambiguously
+note: `Thing` could also refer to the enum imported here
+  --> $DIR/import-after-macro-expand-2.rs:3:5
+   |
+LL | use thing::*;
+   |     ^^^^^^^^
+   = help: use `crate::Thing` to refer to this enum unambiguously
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/imports/import-after-macro-expand-6.rs b/tests/ui/imports/import-after-macro-expand-6.rs
@@ -1,4 +1,3 @@
-//@ check-pass
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1633574396
 
 pub mod a {
@@ -19,4 +18,5 @@ use crate::a::HeaderMap;
 
 fn main() {
     let h: crate::b::HeaderMap = HeaderMap;
+    //~^ ERROR ambiguous
 }
diff --git a/tests/ui/imports/import-after-macro-expand-6.stderr b/tests/ui/imports/import-after-macro-expand-6.stderr
@@ -0,0 +1,23 @@
+error[E0659]: `HeaderMap` is ambiguous
+  --> $DIR/import-after-macro-expand-6.rs:20:22
+   |
+LL |     let h: crate::b::HeaderMap = HeaderMap;
+   |                      ^^^^^^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `HeaderMap` could refer to the struct defined here
+  --> $DIR/import-after-macro-expand-6.rs:14:5
+   |
+LL |     pub struct HeaderMap;
+   |     ^^^^^^^^^^^^^^^^^^^^^
+   = help: use `self::HeaderMap` to refer to this struct unambiguously
+note: `HeaderMap` could also refer to the struct imported here
+  --> $DIR/import-after-macro-expand-6.rs:12:13
+   |
+LL |     pub use self::http::*;
+   |             ^^^^^^^^^^^^^
+   = help: use `self::HeaderMap` to refer to this struct unambiguously
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/imports/import-after-macro-expand-9.rs b/tests/ui/imports/import-after-macro-expand-9.rs
@@ -1,5 +1,3 @@
-//@ check-pass
-
 use crate::b::*;
 
 mod b {
@@ -14,4 +12,5 @@ mod b {
 
 fn main() {
     let h: crate::b::HeaderMap = HeaderMap;
+    //~^ ERROR ambiguous
 }
diff --git a/tests/ui/imports/import-after-macro-expand-9.stderr b/tests/ui/imports/import-after-macro-expand-9.stderr
@@ -0,0 +1,23 @@
+error[E0659]: `HeaderMap` is ambiguous
+  --> $DIR/import-after-macro-expand-9.rs:14:22
+   |
+LL |     let h: crate::b::HeaderMap = HeaderMap;
+   |                      ^^^^^^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `HeaderMap` could refer to the struct defined here
+  --> $DIR/import-after-macro-expand-9.rs:10:5
+   |
+LL |     pub struct HeaderMap;
+   |     ^^^^^^^^^^^^^^^^^^^^^
+   = help: use `self::HeaderMap` to refer to this struct unambiguously
+note: `HeaderMap` could also refer to the struct imported here
+  --> $DIR/import-after-macro-expand-9.rs:8:13
+   |
+LL |     pub use self::http::*;
+   |             ^^^^^^^^^^^^^
+   = help: use `self::HeaderMap` to refer to this struct unambiguously
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/imports/issue-114682-1.rs b/tests/ui/imports/issue-114682-1.rs
@@ -22,4 +22,5 @@ mac!();
 fn main() {
     A!();
     //~^ ERROR `A` is ambiguous
+    //~^^ ERROR `A` is ambiguous
 }
diff --git a/tests/ui/imports/issue-114682-1.stderr b/tests/ui/imports/issue-114682-1.stderr
@@ -23,6 +23,32 @@ LL | pub use m::*;
    = help: consider adding an explicit import of `A` to disambiguate
    = note: this error originates in the macro `mac` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 1 previous error
+error[E0659]: `A` is ambiguous
+  --> $DIR/issue-114682-1.rs:23:5
+   |
+LL |     A!();
+   |     ^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `A` could refer to the macro defined here
+  --> $DIR/issue-114682-1.rs:7:9
+   |
+LL | /         pub macro A() {
+LL | |             println!("non import")
+LL | |         }
+   | |_________^
+...
+LL |   mac!();
+   |   ------ in this macro invocation
+   = help: use `crate::A` to refer to this macro unambiguously
+note: `A` could also refer to the macro imported here
+  --> $DIR/issue-114682-1.rs:19:9
+   |
+LL | pub use m::*;
+   |         ^^^^
+   = help: use `crate::A` to refer to this macro unambiguously
+   = note: this error originates in the macro `mac` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/imports/local-modularized-tricky-fail-1.rs b/tests/ui/imports/local-modularized-tricky-fail-1.rs
@@ -27,6 +27,7 @@ mod inner1 {
 }
 
 exported!(); //~ ERROR `exported` is ambiguous
+//~^ ERROR `exported` is ambiguous
 
 mod inner2 {
     define_exported!();
diff --git a/tests/ui/imports/local-modularized-tricky-fail-1.stderr b/tests/ui/imports/local-modularized-tricky-fail-1.stderr
@@ -23,8 +23,34 @@ LL | use inner1::*;
    = help: consider adding an explicit import of `exported` to disambiguate
    = note: this error originates in the macro `define_exported` (in Nightly builds, run with -Z macro-backtrace for more info)
 
+error[E0659]: `exported` is ambiguous
+  --> $DIR/local-modularized-tricky-fail-1.rs:29:1
+   |
+LL | exported!();
+   | ^^^^^^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
+note: `exported` could refer to the macro defined here
+  --> $DIR/local-modularized-tricky-fail-1.rs:6:5
+   |
+LL | /     macro_rules! exported {
+LL | |         () => ()
+LL | |     }
+   | |_____^
+...
+LL |       define_exported!();
+   |       ------------------ in this macro invocation
+   = help: use `crate::exported` to refer to this macro unambiguously
+note: `exported` could also refer to the macro imported here
+  --> $DIR/local-modularized-tricky-fail-1.rs:23:5
+   |
+LL | use inner1::*;
+   |     ^^^^^^^^^
+   = help: use `crate::exported` to refer to this macro unambiguously
+   = note: this error originates in the macro `define_exported` (in Nightly builds, run with -Z macro-backtrace for more info)
+
 error[E0659]: `panic` is ambiguous
-  --> $DIR/local-modularized-tricky-fail-1.rs:36:5
+  --> $DIR/local-modularized-tricky-fail-1.rs:37:5
    |
 LL |     panic!();
    |     ^^^^^ ambiguous name
@@ -45,7 +71,7 @@ LL |       define_panic!();
    = note: this error originates in the macro `define_panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `include` is ambiguous
-  --> $DIR/local-modularized-tricky-fail-1.rs:47:1
+  --> $DIR/local-modularized-tricky-fail-1.rs:48:1
    |
 LL | include!();
    | ^^^^^^^ ambiguous name
@@ -65,6 +91,6 @@ LL |       define_include!();
    = help: use `crate::include` to refer to this macro unambiguously
    = note: this error originates in the macro `define_include` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 3 previous errors
+error: aborting due to 4 previous errors
 
 For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/imports/macro-paths.rs b/tests/ui/imports/macro-paths.rs
@@ -11,6 +11,7 @@ mod foo {
 fn f() {
     use foo::*;
     bar::m! { //~ ERROR ambiguous
+    //~^ ERROR ambiguous
         mod bar { pub use two_macros::m; }
     }
 }
diff --git a/tests/ui/imports/macro-paths.stderr b/tests/ui/imports/macro-paths.stderr
diff --git a/tests/ui/imports/macros.rs b/tests/ui/imports/macros.rs
diff --git a/tests/ui/imports/macros.stderr b/tests/ui/imports/macros.stderr
diff --git a/tests/ui/underscore-imports/shadow.rs b/tests/ui/underscore-imports/shadow.rs
diff --git a/tests/ui/underscore-imports/shadow.stderr b/tests/ui/underscore-imports/shadow.stderr

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-//@ check-pass`
`2`		`-`
`3`	`1`	`#[derive(Debug)]`
`4`	`2`	`struct H;`
`5`	`3`
`@@ -14,6 +12,7 @@ mod p {`
`14`	`12`
`15`	`13`	`fn f() {`
`16`	`14`	`let h: crate::p::H = H;`
	`15`	`+ //~^ ERROR ambiguous`
`17`	`16`	`}`
`18`	`17`	`}`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-//@ check-pass`
`2`	`1`	// similar as `import-after-macro-expand-6.rs`
`3`	`2`
`4`	`3`	`use crate::a::HeaderMap;`
`@@ -19,4 +18,5 @@ mod a {`
`19`	`18`
`20`	`19`	`fn main() {`
`21`	`20`	`let h: crate::b::HeaderMap = HeaderMap;`
	`21`	`+ //~^ ERROR ambiguous`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-//@ check-pass`
`2`	`1`	`// https://github.com/rust-lang/rust/issues/56593#issuecomment-1133174514`
`3`	`2`
`4`	`3`	`use thing::*;`
`@@ -13,6 +12,7 @@ mod tests {`
`13`	`12`
`14`	`13`	`fn test_thing() {`
`15`	`14`	`let thing: crate::Thing = Thing::Foo;`
	`15`	`+ //~^ ERROR ambiguous`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`