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

rustbot · 2025-10-08T14:13:22Z

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-10-08T14:16:25Z

Rebased to get the changes from my previous PR.

LorrensP-2158466 · 2025-10-08T14:54:16Z

Ah right, that test.

LorrensP-2158466 · 2025-10-08T15:11:05Z

@petrochenkov I have reverted that change in finalize_resolutions_in, so you can run crater on that if needed. In the mean time i'll try and implemented as you suggested in the zulip thread.

petrochenkov · 2025-10-09T17:19:38Z

@petrochenkov I have reverted that change in finalize_resolutions_in, so you can run crater on that if needed. In the mean time i'll try and implemented as you suggested in the zulip thread.

Please, set the waiting-on-review label if something is needed from me, otherwise it gets lost easily.
@bors try

…=<try> Resolver: Batched Import Resolution

LorrensP-2158466 · 2025-10-09T17:21:23Z

Please, set the waiting-on-review label if something is needed from me, otherwise it gets lost easily.

Ah right, sorry!

rust-bors · 2025-10-09T19:30:47Z

☀️ Try build successful (CI)
Build commit: 2278ef2 (2278ef25f90817c20d6dd0d2da58a990eb6f53cb, parent: 0b278a539440be291466ea463a9b6310eaf4d7bb)

petrochenkov · 2025-10-09T20:37:35Z

@craterbot check

craterbot · 2025-10-09T20:37:55Z

👌 Experiment pr-145108-1 created and queued.
🤖 Automatically detected try build 2278ef2
🔍 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

craterbot · 2025-10-09T20:39:06Z

🚧 Experiment pr-145108-1 is now running

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

craterbot · 2025-10-11T13:09:21Z

🎉 Experiment pr-145108-1 is completed!
📊 195 regressed and 3 fixed (713837 total)
📊 1734 spurious results on the retry-regessed-list.txt, consider a retry¹ if this is a significant amount.
📰 Open the summary report.

⚠️ If you notice any spurious failure please add them to the denylist!
ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

re-run the experiment with crates=https://crater-reports.s3.amazonaws.com/pr-145108-1/retry-regressed-list.txt ↩

…etrochenkov Test: Ambigious bindings in same namespace with the same res Add a test based on the discussion [here](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/near/542316157) and related to rust-lang/rust#145575 (comment). This is the most reduced form I could create that passes on nightly but fails with rust-lang/rust#145108 (see [#gsoc > Project: Parallel Macro Expansion @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/near/542335131)). Also not sure about the test names. r? `@petrochenkov`

LorrensP-2158466 · 2025-10-13T16:47:12Z

Almost all regressions are due to the privacy error of RustEmbed or a indirect error because of that privacy error.

I found one other type of regression with some crates using polar-rs 44.2, but I don't understand that one:

error[E0308]: mismatched types
    --> src/occupancy.rs:202:36
[INFO] [stdout]     |
 202 |                       max_horizontal([
     |  _____________________--------------_^
     | |                     |
     | |                     arguments to this function are incorrect
 203 | |                         col("A_pseudo"),
 204 | |                         col("C_pseudo"),
 205 | |                         col("G_pseudo"),
 206 | |                         col("T_pseudo"),
 207 | |                     ])
     | |_____________________^ expected `&[Column]`, found `[Expr; 4]`
     |
     = note: expected reference `&[polars::prelude::Column]`
                    found array `[Expr; 4]`
 note: function defined here
    --> /opt/rustwide/cargo-home/registry/src/index.crates.io-1949cf8c6b5b557f/polars-ops-0.44.2/src/series/ops/horizontal.rs:4:8
     |
   4 | pub fn max_horizontal(s: &[Column]) -> PolarsResult<Option<Column>> {

Looking up col in polar-rs 44.2 results in:

pub fn col(name: &str) -> Expr;

And I haven't found any other definitions of max_horizontal.

LorrensP-2158466 · 2025-10-13T17:09:29Z

compiler/rustc_resolve/src/imports.rs

+        // "Same res different import" ambiguity hack for macros introduced in #145108.
+        // See related discussion for more info:
+        // https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/near/542057918.
+        if ns == MacroNS {
+            if let Some(def_id) = res.opt_def_id() {
+                self.greatest_vis_map
+                    .entry(def_id)
+                    .and_modify(|vis| {
+                        if !vis.is_at_least(binding.vis, tcx) {
+                            *vis = binding.vis
+                        }
+                    })
+                    .or_insert(binding.vis);
+            }
+        }


Should this also check if the binding is introduced through a glob?

Currently, the case of doing the glob import with a macro also succeeds, which fails on nightly. Can we check whether the expansion IDs match?

LorrensP-2158466 · 2025-10-13T17:09:46Z

@rustbot ready

rust-log-analyzer · 2025-10-13T17:49:44Z

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

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


error[E0603]: macro `format_args` is private
    --> /cargo/registry/src/index.crates.io-1949cf8c6b5b557f/tracing-0.1.41/src/macros.rs:2961:104
     |
2961 | ...   $crate::valueset!(@ { (&$next, $crate::__macro_support::Option::Some(&$crate::__macro_support::format_args!($($rest)+) as &dyn Valu...
     |                                                                                                      ^^^^^^^^^^^ private macro
     |
note: the macro `format_args` is defined here
    --> /cargo/registry/src/index.crates.io-1949cf8c6b5b557f/tracing-0.1.41/src/lib.rs:993:34
     |
 993 |     pub use core::{concat, file, format_args, iter::Iterator, line, option::Option};
     |                                  ^^^^^^^^^^^
help: consider importing this macro instead
     |
2961 -         $crate::valueset!(@ { (&$next, $crate::__macro_support::Option::Some(&$crate::__macro_support::format_args!($($rest)+) as &dyn Value)), $($out),* }, $next, )
2961 +         $crate::valueset!(@ { (&$next, $crate::__macro_support::Option::Some(&std::format_args!($($rest)+) as &dyn Value)), $($out),* }, $next, )
     |
help: import `format_args` directly
     |
2961 -         $crate::valueset!(@ { (&$next, $crate::__macro_support::Option::Some(&$crate::__macro_support::format_args!($($rest)+) as &dyn Value)), $($out),* }, $next, )
2961 +         $crate::valueset!(@ { (&$next, $crate::__macro_support::Option::Some(&core::macros::builtin::format_args!($($rest)+) as &dyn Value)), $($out),* }, $next, )
     |

[RUSTC-TIMING] blake3 test:false 1.228
   Compiling sha1 v0.10.6
[RUSTC-TIMING] sha1 test:false 0.383

LorrensP-2158466 · 2025-10-13T18:25:25Z

When running the command of the failing job I get a different error (with latest master rebased):

error[E0603]: macro `cryptocorrosion_derive_traits` is private
   --> /Users/lorrens/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/ppv-lite86-0.2.21/src/soft.rs:8:11
    |
  8 | zerocopy::cryptocorrosion_derive_traits! {
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ private macro
    |
note: the macro `cryptocorrosion_derive_traits` is defined here
   --> /Users/lorrens/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/zerocopy-0.8.26/src/macros.rs:853:1
    |
853 | macro_rules! cryptocorrosion_derive_traits {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
help: import `cryptocorrosion_derive_traits` directly
    |
  8 | zerocopy::macros::cryptocorrosion_derive_traits! {
    |           ++++++++

Which caused a bunch of other errors. I'm not that experienced with reading those job errors and figuring out what to do (especially with the mismatch locally). Could you point me in the right direction?

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 Show resolved Hide resolved

LorrensP-2158466 commented Aug 12, 2025

View reviewed changes

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

LorrensP-2158466 commented Aug 12, 2025

View reviewed changes

tests/ui/proc-macro/derive-helper-legacy-spurious.rs 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

bless test for green CI

0bd2ce4

LorrensP-2158466 force-pushed the batched-import-resolution branch from 0eba015 to 0bd2ce4 Compare October 8, 2025 14:13

This comment has been minimized.

Sign in to view

bless another test

8f39eee

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Oct 9, 2025

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

2278ef2

…=<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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 9, 2025

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

LorrensP-2158466 commented Oct 13, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

hack for RustEmbed with updated test

3b3d0ed

LorrensP-2158466 force-pushed the batched-import-resolution branch from 1d22dcc to 3b3d0ed Compare October 13, 2025 17:38

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!

rustbot commented Oct 8, 2025

Uh oh!

LorrensP-2158466 commented Oct 8, 2025

Uh oh!

This comment has been minimized.

LorrensP-2158466 commented Oct 8, 2025

Uh oh!

LorrensP-2158466 commented Oct 8, 2025

Uh oh!

petrochenkov commented Oct 9, 2025

Uh oh!

This comment has been minimized.

LorrensP-2158466 commented Oct 9, 2025

Uh oh!

rust-bors bot commented Oct 9, 2025

Uh oh!

petrochenkov commented Oct 9, 2025

Uh oh!

craterbot commented Oct 9, 2025

Uh oh!

craterbot commented Oct 9, 2025

Uh oh!

craterbot commented Oct 11, 2025

Footnotes

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LorrensP-2158466 commented Oct 13, 2025

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Oct 13, 2025

Uh oh!

LorrensP-2158466 commented Oct 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

LorrensP-2158466 commented Aug 11, 2025 •

edited

Loading

LorrensP-2158466 commented Oct 13, 2025 •

edited

Loading

LorrensP-2158466 Oct 13, 2025 •

edited

Loading