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

bless another test

rustbot · 2025-10-15T14:41:12Z

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-15T15:36:30Z

I can reproduce that locally, but when I remove that import, everything compiles just fine. I'm guessing this has nothing to do with this pr, so I'll just wait.

petrochenkov · 2025-10-15T16:13:48Z

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

@LorrensP-2158466 Could you send a PR with a fix to the RustEmbed crate itself, so it reexports the macro properly?

petrochenkov · 2025-10-15T16:17:30Z

I can reproduce that locally, but when I remove that import, everything compiles just fine. I'm guessing this has nothing to do with this pr, so I'll just wait.

If the import is legitimately unused, then it should be removed.
(This PR may potentially result in detecting more unused imports.)

LorrensP-2158466 · 2025-10-15T16:35:49Z

(This PR may potentially result in detecting more unused imports.)

Nice! I'll remove it.

rustbot · 2025-10-15T16:36:40Z

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

petrochenkov · 2025-10-15T16:46:12Z

compiler/rustc_resolve/src/imports.rs

+                            self.greatest_vis_map.get(&def_id).copied().unwrap_or(binding.vis);
+                        // macros exported through `macro_export` are not placed in this map, so
+                        // hack the hack and make sure we still keep the best visibility.
+                        if !vis.is_at_least(binding.vis, self.tcx()) { binding.vis } else { vis }


This hack has a chance to promote too many unrelated bindings to pub.

Unrelated public item with the same DefId in a different module? Promote to pub.
The glob import never shadows any #[macro_rules] and is never reexported? Nevermind, still promote to pub.

So the hack doesn't actually track when a reexport glob shadows a #[macro_use] binding.

petrochenkov · 2025-10-15T16:51:12Z

This is blocked on me doing some work, rather than reviewing (reexporting ambiguities to other crates, removing mutability from extern underscore disambiguators, finding better solution for the RustEmbed problem).
@rustbot blocked

petrochenkov · 2025-10-15T17:01:35Z

@LorrensP-2158466 Could you send a PR with a fix to the RustEmbed crate itself, so it reexports the macro properly?

When clicking on the "repository" link in the crates-io page, I get "404 not found", link: https://git.sr.ht/~pyrossh/rust-embed.

Searching for it in "sourcehut" also doesn't work: https://sr.ht/projects?search=rust-embed&sort=longest-active.

I also can't find it on GitHub and GitLab

https://pyrossh.dev has the author's email.

…, r=petrochenkov use module_child index as disambiguator for external items When defining the items of an external module, if that item is an underscore we use it's index as the disambiguator. This is needed for parallel import resolution, which is being worked on in rust-lang#145108. r? `@petrochenkov`

Rollup merge of #147805 - LorrensP-2158466:extern-mod-disamb, r=petrochenkov use module_child index as disambiguator for external items When defining the items of an external module, if that item is an underscore we use it's index as the disambiguator. This is needed for parallel import resolution, which is being worked on in #145108. r? `@petrochenkov`

…enkov Resolve: (Ref)Cell wrappers to deny mutation during spec resolution. Introduces wrappers around `Cell` and `RefCell` that only allow mutation when we are not in speculative resolution. This is preparatory work for rust-lang/rust#145108. It would allow us to make `ImportData` and `ModuleData` sync and send safe. r? ``@petrochenkov``

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

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

LorrensP-2158466 added 3 commits October 15, 2025 16:28

bless test

e36db52

revert change in finalize_resolutions_in + other small things

7ce6328

bless test for green CI

079556e

bless another test

LorrensP-2158466 force-pushed the batched-import-resolution branch from be968c5 to 9e951c9 Compare October 15, 2025 14:41

This comment has been minimized.

Sign in to view

rustbot added the T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. label Oct 15, 2025

petrochenkov reviewed Oct 15, 2025

View reviewed changes

This comment was marked as off-topic.

Sign in to view

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 15, 2025

petrochenkov mentioned this pull request Oct 16, 2025

Introduce Scope::NonGlobModule and Scope::GlobModule #144131

Open

LorrensP-2158466 mentioned this pull request Oct 17, 2025

use module_child index as disambiguator for external items #147805

Merged

hack for RustEmbed with updated test

88b3daf

LorrensP-2158466 force-pushed the batched-import-resolution branch from e3a3239 to 88b3daf Compare October 24, 2025 09:26

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

Uh oh!

This comment has been minimized.

LorrensP-2158466 commented Oct 15, 2025

Uh oh!

petrochenkov commented Oct 15, 2025

Uh oh!

petrochenkov commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LorrensP-2158466 commented Oct 15, 2025

Uh oh!

rustbot commented Oct 15, 2025

Uh oh!

petrochenkov Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

LorrensP-2158466 Oct 18, 2025

Choose a reason for hiding this comment

Uh oh!

This comment was marked as off-topic.

petrochenkov commented Oct 15, 2025

Uh oh!

petrochenkov commented Oct 15, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

LorrensP-2158466 commented Aug 11, 2025 •

edited

Loading

petrochenkov commented Oct 15, 2025 •

edited

Loading