Resolver: Batched Import Resolution #145108

LorrensP-2158466 · 2025-08-08T15:54:37Z

Transforms the current algorithm for resolving imports to a batched algorithm. Every import in the indeterminate_imports set is resolved in isolation. This is the only real difference from the current algorithm.

r? petrochenkov

compiler/rustc_resolve/src/lib.rs

compiler/rustc_resolve/src/imports.rs

LorrensP-2158466 · 2025-08-11T19:29:42Z

Code looks a little better now and should be more correct than the previous commits, but I have yet to find a way to resolve the current test failures.

LorrensP-2158466 · 2025-08-11T20:34:04Z

Okey, I did fix core not being built, but those other errors happened again. We now resolve the prelude import path when we create such an import at build_reduced_graph phase.

petrochenkov · 2025-08-11T22:39:59Z

Could you update the tests to make CI green, so I can see the difference?
(Even if the changes do not seem correct.)

tests/ui/imports/ambiguous-9.rs

tests/ui/imports/glob-conflict-cross-crate-1.rs

tests/ui/proc-macro/derive-helper-legacy-spurious.rs

petrochenkov · 2025-08-12T17:43:51Z

Moving prelude_import processing to build_reduced_graph may also be necessary for #139493.

LorrensP-2158466 · 2025-08-12T17:49:54Z

I'll create a pr for it.

compiler/rustc_resolve/src/imports.rs

LorrensP-2158466 · 2025-08-21T15:10:26Z

Original resolver errors are resolved, but...
Compiling libcore now fails where some traits are not implemented for some types, but the code does implement them. Most notable Copy, I have a feeling its derive macro is not being resolved correctly.

Collect side effects from the current set of undetermined imports and only apply them at the end.

rustbot · 2025-08-26T20:40:52Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

LorrensP-2158466 · 2025-08-26T21:16:57Z

Some tests get different or duplicate errors on some lines. Not sure why this is yet.

LorrensP-2158466 · 2025-08-27T11:53:20Z

Had to bless/change a lot of tests, but they all look like duplicates; I didn't spot anything wrong going on.

petrochenkov · 2025-08-27T12:08:14Z

Had to bless/change a lot of tests, but they all look like duplicates; I didn't spot anything wrong going on.

Answered on zulip about this.

compiler/rustc_resolve/src/imports.rs

tests/ui/imports/ambiguous-9.rs

tests/ui/imports/glob-conflict-cross-crate-1.rs

LorrensP-2158466 · 2025-08-27T16:19:13Z

compiler/rustc_resolve/src/imports.rs

+        // HACK: Use array of namespaces in the same order as `per_ns_mut`.
+        // We can't use `per_ns_cm` because of the invariance on CmResolver (RefOrMut).
+        for ns in [TypeNS, ValueNS, MacroNS] {


Unfortunately, the only way out.

LorrensP-2158466 · 2025-08-27T16:29:14Z

tests/ui/imports/ambiguous-9.rs

@@ -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!


First import not receiving the warning is the wrong part.

LorrensP-2158466 · 2025-08-27T16:30:06Z

tests/ui/imports/glob-conflict-cross-crate-1.rs

-    glob_conflict::glob::f(); //~ ERROR cannot find function `f` in module `glob_conflict::glob`
+    glob_conflict::glob::f();


Also wrong, I believe. Should give an error or a warning.

rust-log-analyzer · 2025-08-27T17:01:40Z

The job aarch64-gnu-llvm-19-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

-   --> $DIR/shadowed-use-visibility.rs:15:10
+ error[E0603]: module import `bar` is private
+   --> $DIR/shadowed-use-visibility.rs:9:21
3    |
- LL | use bar::f::f;
-    |          ^ private module import
+ LL |     use crate::foo::bar::f as g;
+    |                     ^^^ private module import
6    |
- note: the module import `f` is defined here...
-   --> $DIR/shadowed-use-visibility.rs:11:9
+ note: the module import `bar` is defined here...
---
-   --> $DIR/shadowed-use-visibility.rs:9:21
+ error[E0603]: module import `f` is private
+   --> $DIR/shadowed-use-visibility.rs:15:10
20    |
- LL |     use crate::foo::bar::f as g;
-    |                     ^^^ private module import
+ LL | use bar::f::f;
+    |          ^ private module import
23    |
- note: the module import `bar` is defined here...
-   --> $DIR/shadowed-use-visibility.rs:4:9
+ note: the module import `f` is defined here...
+   --> $DIR/shadowed-use-visibility.rs:11:9
---
31    |

Note: some mismatched output was normalized before being compared
-   --> /checkout/tests/ui/shadowed/shadowed-use-visibility.rs:9:21
- LL |     use crate::foo::bar::f as g; //~ ERROR module import `bar` is private
-   --> /checkout/tests/ui/shadowed/shadowed-use-visibility.rs:4:9
-   --> /checkout/tests/ui/shadowed/shadowed-use-visibility.rs:15:10
- LL | use bar::f::f; //~ ERROR module import `f` is private
-   --> /checkout/tests/ui/shadowed/shadowed-use-visibility.rs:11:9
+ error[E0603]: module import `bar` is private
+   --> $DIR/shadowed-use-visibility.rs:9:21
+ LL |     use crate::foo::bar::f as g;
+    |                     ^^^ private module import
+ note: the module import `bar` is defined here...
+   --> $DIR/shadowed-use-visibility.rs:4:9
+ LL |     use crate::foo as bar;
+    |         ^^^^^^^^^^^^^^^^^
+ error[E0603]: module import `f` is private
+   --> $DIR/shadowed-use-visibility.rs:15:10
+ LL | use bar::f::f;
+    |          ^ private module import
+ note: the module import `f` is defined here...
+   --> $DIR/shadowed-use-visibility.rs:11:9
+ LL |     use crate::foo as f;
+    |         ^^^^^^^^^^^^^^^


The actual stderr differed from the expected stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args shadowed/shadowed-use-visibility.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/shadowed/shadowed-use-visibility.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2" "--target=aarch64-unknown-linux-gnu" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/shadowed/shadowed-use-visibility" "-A" "unused" "-A" "internal_features" "-A" "unused_parens" "-A" "unused_braces" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers"
stdout: none
--- stderr -------------------------------
error[E0603]: module import `bar` is private
##[error]  --> /checkout/tests/ui/shadowed/shadowed-use-visibility.rs:9:21
   |
LL |     use crate::foo::bar::f as g; //~ ERROR module import `bar` is private
   |                     ^^^ private module import
   |
note: the module import `bar` is defined here...
  --> /checkout/tests/ui/shadowed/shadowed-use-visibility.rs:4:9
   |
---

error[E0603]: module import `f` is private
##[error]  --> /checkout/tests/ui/shadowed/shadowed-use-visibility.rs:15:10
   |
LL | use bar::f::f; //~ ERROR module import `f` is private
   |          ^ private module import
   |
note: the module import `f` is defined here...
  --> /checkout/tests/ui/shadowed/shadowed-use-visibility.rs:11:9
   |
LL |     use crate::foo as f;

rustbot assigned petrochenkov Aug 8, 2025

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 8, 2025

This comment has been minimized.

Sign in to view

LorrensP-2158466 commented Aug 8, 2025

View reviewed changes

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

LorrensP-2158466 marked this pull request as ready for review August 11, 2025 08:37

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 11, 2025

LorrensP-2158466 commented Aug 11, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

petrochenkov reviewed Aug 11, 2025

View reviewed changes

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 11, 2025

This comment has been minimized.

Sign in to view

LorrensP-2158466 force-pushed the batched-import-resolution branch from a3f8ae2 to 4a2a0dc Compare August 11, 2025 20:37

This comment has been minimized.

Sign in to view

petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 12, 2025

LorrensP-2158466 commented Aug 12, 2025

View reviewed changes

tests/ui/imports/ambiguous-9.rs Outdated Show resolved Hide resolved

LorrensP-2158466 commented Aug 12, 2025

View reviewed changes

tests/ui/imports/glob-conflict-cross-crate-1.rs Outdated Show resolved Hide resolved

LorrensP-2158466 commented Aug 12, 2025

View reviewed changes

tests/ui/proc-macro/derive-helper-legacy-spurious.rs Outdated Show resolved Hide resolved

LorrensP-2158466 commented Aug 12, 2025

View reviewed changes

tests/ui/proc-macro/derive-helper-legacy-spurious.rs Outdated Show resolved Hide resolved

petrochenkov reviewed Aug 12, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

LorrensP-2158466 commented Aug 21, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

LorrensP-2158466 force-pushed the batched-import-resolution branch from 3b2e50e to 4efdee8 Compare August 21, 2025 15:08

This comment has been minimized.

Sign in to view

LorrensP-2158466 added 2 commits August 26, 2025 22:33

Resolver: Batched import resolution.

89bf3ed

Collect side effects from the current set of undetermined imports and only apply them at the end.

Several logical changes.

8499dd2

LorrensP-2158466 force-pushed the batched-import-resolution branch from 4efdee8 to 8499dd2 Compare August 26, 2025 20:40

This comment was marked as resolved.

Sign in to view

petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 27, 2025

petrochenkov reviewed Aug 27, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 27, 2025

LorrensP-2158466 added 5 commits August 27, 2025 17:43

Report glob errors in first phase of commit.

ac73317

fix duplicate errors

c7f94d9

Adress review.

3289351

bless correct tests

42f3d7f

bless other tests

c334245

LorrensP-2158466 force-pushed the batched-import-resolution branch from fe82c39 to c334245 Compare August 27, 2025 16:11

LorrensP-2158466 commented Aug 27, 2025

View reviewed changes

tests/ui/imports/ambiguous-9.rs Outdated Show resolved Hide resolved

LorrensP-2158466 commented Aug 27, 2025

View reviewed changes

tests/ui/imports/glob-conflict-cross-crate-1.rs Outdated Show resolved Hide resolved

LorrensP-2158466 commented Aug 27, 2025

View reviewed changes

fix oopsie

c607822

LorrensP-2158466 commented Aug 27, 2025

View reviewed changes

		glob_conflict::glob::f(); //~ ERROR cannot find function `f` in module `glob_conflict::glob`
		glob_conflict::glob::f();

Resolver: Batched Import Resolution #145108

Are you sure you want to change the base?

Resolver: Batched Import Resolution #145108

Conversation

LorrensP-2158466 commented Aug 8, 2025

Uh oh!

This comment has been minimized.

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LorrensP-2158466 commented Aug 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

LorrensP-2158466 commented Aug 11, 2025

Uh oh!

This comment has been minimized.

petrochenkov commented Aug 11, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Aug 12, 2025

Uh oh!

LorrensP-2158466 commented Aug 12, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

LorrensP-2158466 commented Aug 21, 2025

Uh oh!

rustbot commented Aug 26, 2025

Uh oh!

LorrensP-2158466 commented Aug 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

LorrensP-2158466 commented Aug 27, 2025

Uh oh!

petrochenkov commented Aug 27, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LorrensP-2158466 Aug 27, 2025

Choose a reason for hiding this comment

Uh oh!

LorrensP-2158466 Aug 27, 2025

Choose a reason for hiding this comment

Uh oh!

LorrensP-2158466 Aug 27, 2025

Choose a reason for hiding this comment

Uh oh!

rust-log-analyzer commented Aug 27, 2025

Uh oh!

Uh oh!

LorrensP-2158466 commented Aug 11, 2025 •

edited

Loading

LorrensP-2158466 commented Aug 26, 2025 •

edited

Loading