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

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.

LorrensP-2158466 · 2025-08-28T16:31:04Z

@rustbot ready

petrochenkov · 2025-08-28T22:10:06Z

This should be ready for crater.
@bors try

…=<try> Resolver: Batched Import Resolution

rust-bors · 2025-08-29T00:27:32Z

☀️ Try build successful (CI)
Build commit: ae40d86 (ae40d86d689c7b8b0a48c1e4b9d38e02bc2beab1, parent: 35d55b34bffd51384ac430cc20852b7d16dd5a90)

petrochenkov · 2025-08-29T07:40:50Z

@craterbot check

craterbot · 2025-08-29T07:41:13Z

👌 Experiment pr-145108 created and queued.
🤖 Automatically detected try build ae40d86
🔍 You can check out the queue and this experiment's details.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

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

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

This comment has been minimized.

Sign in to view

disallow ambiguous names imported from external crates

2c05214

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 28, 2025

This comment has been minimized.

Sign in to view

bless test

0eba015

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Aug 28, 2025

Auto merge of #145108 - LorrensP-2158466:batched-import-resolution, r…

ae40d86

…=<try> Resolver: Batched Import Resolution

petrochenkov added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 28, 2025

		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

Uh oh!

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!

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!

This comment has been minimized.

LorrensP-2158466 commented Aug 28, 2025

Uh oh!

This comment has been minimized.

petrochenkov commented Aug 28, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Aug 29, 2025

Uh oh!

petrochenkov commented Aug 29, 2025

Uh oh!

craterbot commented Aug 29, 2025

Uh oh!

Uh oh!

LorrensP-2158466 commented Aug 11, 2025 •

edited

Loading