Auto merge of #145108 - LorrensP-2158466:batched-import-resolution, r=<try>

rust-bors[bot] · web-flow · commit ae40d86d689c · 2025-08-28T22:10:09.000Z
Resolver: Batched Import Resolution
diff --git a/compiler/rustc_resolve/src/imports.rs b/compiler/rustc_resolve/src/imports.rs
diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs
@@ -1823,15 +1823,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         f(self, MacroNS);
     }
 
-    fn per_ns_cm<'r, F: FnMut(&mut CmResolver<'r, 'ra, 'tcx>, Namespace)>(
-        mut self: CmResolver<'r, 'ra, 'tcx>,
-        mut f: F,
-    ) {
-        f(&mut self, TypeNS);
-        f(&mut self, ValueNS);
-        f(&mut self, MacroNS);
-    }
-
     fn is_builtin_macro(&self, res: Res) -> bool {
         self.get_macro(res).is_some_and(|macro_data| macro_data.ext.builtin_name.is_some())
     }
@@ -2541,12 +2532,6 @@ mod ref_mut {
                 true => self.p,
             }
         }
-
-        /// Returns a mutable reference to the inner value without checking if
-        /// it's in a mutable state.
-        pub(crate) fn get_mut_unchecked(&mut self) -> &mut T {
-            self.p
-        }
     }
 }
 
diff --git a/tests/ui/imports/ambiguous-2.rs b/tests/ui/imports/ambiguous-2.rs
@@ -1,10 +1,9 @@
-//@ check-pass
 //@ aux-build: ../ambiguous-1.rs
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1633574396
 
 extern crate ambiguous_1;
 
 fn main() {
-    ambiguous_1::id();
+    ambiguous_1::id(); //~ ERROR cannot find function `id` in crate `ambiguous_1`
     //^ FIXME: `id` should be identified as an ambiguous item.
 }
diff --git a/tests/ui/imports/ambiguous-2.stderr b/tests/ui/imports/ambiguous-2.stderr
@@ -0,0 +1,19 @@
+error[E0425]: cannot find function `id` in crate `ambiguous_1`
+  --> $DIR/ambiguous-2.rs:7:18
+   |
+LL |     ambiguous_1::id();
+   |                  ^^ not found in `ambiguous_1`
+   |
+help: consider importing this function
+   |
+LL + use std::process::id;
+   |
+help: if you import `id`, refer to it directly
+   |
+LL -     ambiguous_1::id();
+LL +     id();
+   |
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/imports/ambiguous-4.rs b/tests/ui/imports/ambiguous-4.rs
@@ -1,9 +1,8 @@
-//@ check-pass
 //@ aux-build: ../ambiguous-4-extern.rs
 
 extern crate ambiguous_4_extern;
 
 fn main() {
-    ambiguous_4_extern::id();
+    ambiguous_4_extern::id(); //~ ERROR cannot find function `id` in crate `ambiguous_4_extern`
     //^ FIXME: `id` should be identified as an ambiguous item.
 }
diff --git a/tests/ui/imports/ambiguous-4.stderr b/tests/ui/imports/ambiguous-4.stderr
@@ -0,0 +1,19 @@
+error[E0425]: cannot find function `id` in crate `ambiguous_4_extern`
+  --> $DIR/ambiguous-4.rs:6:25
+   |
+LL |     ambiguous_4_extern::id();
+   |                         ^^ not found in `ambiguous_4_extern`
+   |
+help: consider importing this function
+   |
+LL + use std::process::id;
+   |
+help: if you import `id`, refer to it directly
+   |
+LL -     ambiguous_4_extern::id();
+LL +     id();
+   |
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/imports/ambiguous-9.rs b/tests/ui/imports/ambiguous-9.rs
@@ -4,16 +4,16 @@ pub mod dsl {
     mod range {
         pub fn date_range() {}
     }
-    pub use self::range::*; //~ WARNING ambiguous glob re-exports
+    pub use self::range::*;
     use super::prelude::*;
 }
 
 pub mod prelude {
     mod t {
       pub fn date_range() {}
     }
-    pub use self::t::*; //~ WARNING ambiguous glob re-exports
-    pub use super::dsl::*;
+    pub use self::t::*;
+    pub use super::dsl::*; //~ WARNING ambiguous glob re-exports
 }
 
 use dsl::*;
@@ -23,6 +23,4 @@ fn main() {
     date_range();
     //~^ ERROR `date_range` is ambiguous
     //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-    //~| ERROR `date_range` is ambiguous
-    //~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 }
diff --git a/tests/ui/imports/ambiguous-9.stderr b/tests/ui/imports/ambiguous-9.stderr
@@ -1,10 +1,10 @@
 warning: ambiguous glob re-exports
-  --> $DIR/ambiguous-9.rs:7:13
+  --> $DIR/ambiguous-9.rs:16:13
    |
-LL |     pub use self::range::*;
-   |             ^^^^^^^^^^^^^^ the name `date_range` in the value namespace is first re-exported here
-LL |     use super::prelude::*;
-   |         ----------------- but the name `date_range` in the value namespace is also re-exported here
+LL |     pub use self::t::*;
+   |             ---------- but the name `date_range` in the value namespace is also re-exported here
+LL |     pub use super::dsl::*;
+   |             ^^^^^^^^^^^^^ the name `date_range` in the value namespace is first re-exported here
    |
    = note: `#[warn(ambiguous_glob_reexports)]` on by default
 
@@ -18,50 +18,20 @@ LL |     date_range();
    = note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `date_range` could refer to the function imported here
-  --> $DIR/ambiguous-9.rs:7:13
+  --> $DIR/ambiguous-9.rs:16:13
    |
-LL |     pub use self::range::*;
-   |             ^^^^^^^^^^^^^^
+LL |     pub use super::dsl::*;
+   |             ^^^^^^^^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
 note: `date_range` could also refer to the function imported here
-  --> $DIR/ambiguous-9.rs:8:9
-   |
-LL |     use super::prelude::*;
-   |         ^^^^^^^^^^^^^^^^^
-   = help: consider adding an explicit import of `date_range` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
-
-warning: ambiguous glob re-exports
   --> $DIR/ambiguous-9.rs:15:13
    |
 LL |     pub use self::t::*;
-   |             ^^^^^^^^^^ the name `date_range` in the value namespace is first re-exported here
-LL |     pub use super::dsl::*;
-   |             ------------- but the name `date_range` in the value namespace is also re-exported here
-
-error: `date_range` is ambiguous
-  --> $DIR/ambiguous-9.rs:23:5
-   |
-LL |     date_range();
-   |     ^^^^^^^^^^ ambiguous name
-   |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
-   = note: ambiguous because of multiple glob imports of a name in the same module
-note: `date_range` could refer to the function imported here
-  --> $DIR/ambiguous-9.rs:19:5
-   |
-LL | use dsl::*;
-   |     ^^^^^^
-   = help: consider adding an explicit import of `date_range` to disambiguate
-note: `date_range` could also refer to the function imported here
-  --> $DIR/ambiguous-9.rs:20:5
-   |
-LL | use prelude::*;
-   |     ^^^^^^^^^^
+   |             ^^^^^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
+   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
 
-error: aborting due to 2 previous errors; 2 warnings emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
 error: `date_range` is ambiguous
@@ -74,40 +44,16 @@ LL |     date_range();
    = note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `date_range` could refer to the function imported here
-  --> $DIR/ambiguous-9.rs:7:13
-   |
-LL |     pub use self::range::*;
-   |             ^^^^^^^^^^^^^^
-   = help: consider adding an explicit import of `date_range` to disambiguate
-note: `date_range` could also refer to the function imported here
-  --> $DIR/ambiguous-9.rs:8:9
-   |
-LL |     use super::prelude::*;
-   |         ^^^^^^^^^^^^^^^^^
-   = help: consider adding an explicit import of `date_range` to disambiguate
-   = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
-
-Future breakage diagnostic:
-error: `date_range` is ambiguous
-  --> $DIR/ambiguous-9.rs:23:5
-   |
-LL |     date_range();
-   |     ^^^^^^^^^^ ambiguous name
-   |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
-   = note: ambiguous because of multiple glob imports of a name in the same module
-note: `date_range` could refer to the function imported here
-  --> $DIR/ambiguous-9.rs:19:5
+  --> $DIR/ambiguous-9.rs:16:13
    |
-LL | use dsl::*;
-   |     ^^^^^^
+LL |     pub use super::dsl::*;
+   |             ^^^^^^^^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
 note: `date_range` could also refer to the function imported here
-  --> $DIR/ambiguous-9.rs:20:5
+  --> $DIR/ambiguous-9.rs:15:13
    |
-LL | use prelude::*;
-   |     ^^^^^^^^^^
+LL |     pub use self::t::*;
+   |             ^^^^^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
    = note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
 
diff --git a/tests/ui/imports/import-loop-2.rs b/tests/ui/imports/import-loop-2.rs
@@ -1,9 +1,9 @@
 mod a {
-    pub use crate::b::x;
+    pub use crate::b::x; //~ ERROR unresolved import `crate::b::x`
 }
 
 mod b {
-    pub use crate::a::x; //~ ERROR unresolved import `crate::a::x`
+    pub use crate::a::x;
 
     fn main() { let y = x; }
 }
diff --git a/tests/ui/imports/import-loop-2.stderr b/tests/ui/imports/import-loop-2.stderr
@@ -1,8 +1,8 @@
-error[E0432]: unresolved import `crate::a::x`
-  --> $DIR/import-loop-2.rs:6:13
+error[E0432]: unresolved import `crate::b::x`
+  --> $DIR/import-loop-2.rs:2:13
    |
-LL |     pub use crate::a::x;
-   |             ^^^^^^^^^^^ no `x` in `a`
+LL |     pub use crate::b::x;
+   |             ^^^^^^^^^^^ no `x` in `b`
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/imports/import4.rs b/tests/ui/imports/import4.rs
@@ -1,4 +1,4 @@
-mod a { pub use crate::b::foo; }
-mod b { pub use crate::a::foo; } //~ ERROR unresolved import `crate::a::foo`
+mod a { pub use crate::b::foo; } //~ ERROR unresolved import `crate::b::foo`
+mod b { pub use crate::a::foo; }
 
 fn main() { println!("loop"); }
diff --git a/tests/ui/imports/import4.stderr b/tests/ui/imports/import4.stderr
@@ -1,8 +1,8 @@
-error[E0432]: unresolved import `crate::a::foo`
-  --> $DIR/import4.rs:2:17
+error[E0432]: unresolved import `crate::b::foo`
+  --> $DIR/import4.rs:1:17
    |
-LL | mod b { pub use crate::a::foo; }
-   |                 ^^^^^^^^^^^^^ no `foo` in `a`
+LL | mod a { pub use crate::b::foo; }
+   |                 ^^^^^^^^^^^^^ no `foo` in `b`
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/privacy/privacy1.stderr b/tests/ui/privacy/privacy1.stderr
@@ -23,18 +23,6 @@ LL |     mod baz {
    |     ^^^^^^^
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
-error[E0603]: module `baz` is private
-  --> $DIR/privacy1.rs:147:18
-   |
-LL |         use bar::baz;
-   |                  ^^^ private module
-   |
-note: the module `baz` is defined here
-  --> $DIR/privacy1.rs:56:5
-   |
-LL |     mod baz {
-   |     ^^^^^^^
-
 error[E0603]: module `i` is private
   --> $DIR/privacy1.rs:171:20
    |
@@ -47,6 +35,18 @@ note: the module `i` is defined here
 LL |         mod i {
    |         ^^^^^
 
+error[E0603]: module `baz` is private
+  --> $DIR/privacy1.rs:147:18
+   |
+LL |         use bar::baz;
+   |                  ^^^ private module
+   |
+note: the module `baz` is defined here
+  --> $DIR/privacy1.rs:56:5
+   |
+LL |     mod baz {
+   |     ^^^^^^^
+
 error[E0603]: module `baz` is private
   --> $DIR/privacy1.rs:110:21
    |

Original file line number	Diff line number	Diff line change
`@@ -1823,15 +1823,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {`
`1823`	`1823`	`f(self, MacroNS);`
`1824`	`1824`	`}`
`1825`	`1825`
`1826`		`- fn per_ns_cm<'r, F: FnMut(&mut CmResolver<'r, 'ra, 'tcx>, Namespace)>(`
`1827`		`- mut self: CmResolver<'r, 'ra, 'tcx>,`
`1828`		`- mut f: F,`
`1829`		`- ) {`
`1830`		`- f(&mut self, TypeNS);`
`1831`		`- f(&mut self, ValueNS);`
`1832`		`- f(&mut self, MacroNS);`
`1833`		`- }`
`1834`		`-`
`1835`	`1826`	`fn is_builtin_macro(&self, res: Res) -> bool {`
`1836`	`1827`	`self.get_macro(res).is_some_and(\|macro_data\| macro_data.ext.builtin_name.is_some())`
`1837`	`1828`	`}`
`@@ -2541,12 +2532,6 @@ mod ref_mut {`
`2541`	`2532`	`true => self.p,`
`2542`	`2533`	`}`
`2543`	`2534`	`}`
`2544`		`-`
`2545`		`- /// Returns a mutable reference to the inner value without checking if`
`2546`		`- /// it's in a mutable state.`
`2547`		`- pub(crate) fn get_mut_unchecked(&mut self) -> &mut T {`
`2548`		`- self.p`
`2549`		`- }`
`2550`	`2535`	`}`
`2551`	`2536`	`}`
`2552`	`2537`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`		`-//@ check-pass`
`2`	`1`	`//@ aux-build: ../ambiguous-4-extern.rs`
`3`	`2`
`4`	`3`	`extern crate ambiguous_4_extern;`
`5`	`4`
`6`	`5`	`fn main() {`
`7`		`- ambiguous_4_extern::id();`
	`6`	+ ambiguous_4_extern::id(); //~ ERROR cannot find function `id` in crate `ambiguous_4_extern`
`8`	`7`	//^ FIXME: `id` should be identified as an ambiguous item.
`9`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,16 @@ pub mod dsl {`
`4`	`4`	`mod range {`
`5`	`5`	`pub fn date_range() {}`
`6`	`6`	`}`
`7`		`- pub use self::range::*; //~ WARNING ambiguous glob re-exports`
	`7`	`+ pub use self::range::*;`
`8`	`8`	`use super::prelude::*;`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`pub mod prelude {`
`12`	`12`	`mod t {`
`13`	`13`	`pub fn date_range() {}`
`14`	`14`	`}`
`15`		`- pub use self::t::*; //~ WARNING ambiguous glob re-exports`
`16`		`- pub use super::dsl::*;`
	`15`	`+ pub use self::t::*;`
	`16`	`+ pub use super::dsl::*; //~ WARNING ambiguous glob re-exports`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`use dsl::*;`
`@@ -23,6 +23,4 @@ fn main() {`
`23`	`23`	`date_range();`
`24`	`24`	//~^ ERROR `date_range` is ambiguous
`25`	`25`	`//~\| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`26`		- //~\| ERROR `date_range` is ambiguous
`27`		`- //~\| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`28`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`mod a {`
`2`		`- pub use crate::b::x;`
	`2`	+ pub use crate::b::x; //~ ERROR unresolved import `crate::b::x`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`mod b {`
`6`		- pub use crate::a::x; //~ ERROR unresolved import `crate::a::x`
	`6`	`+ pub use crate::a::x;`
`7`	`7`
`8`	`8`	`fn main() { let y = x; }`
`9`	`9`	`}`