Resolver: Batched Import Resolution #145108
Open
+261
−186
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-author
This comment has been minimized.
This comment has been minimized.
LorrensP-2158466
commented
Aug 8, 2025
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
| } | ||
| } | ||
|
|
||
| impl<'r, 'ra, 'tcx> AsRef<Resolver<'ra, 'tcx>> for ImportResolver<'r, 'ra, 'tcx> { |
There was a problem hiding this comment.
Now it is convenient to have the self: &mut ImportResolver methods because it makes the diff easier to read.
But right before merge we'll need to move the methods to ImportResolver itself, and remove the Deref/AsRef impls.
petrochenkov
added
S-waiting-on-author
|
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. |
This comment has been minimized.
This comment has been minimized.
|
Okey, I did fix |
LorrensP-2158466
force-pushed
the
batched-import-resolution
branch
from
a3f8ae2 to
4a2a0dc
Compare
This comment has been minimized.
This comment has been minimized.
|
Could you update the tests to make CI green, so I can see the difference? |
petrochenkov
added
S-waiting-on-review
tests/ui/imports/ambiguous-9.rs
Outdated
There was a problem hiding this comment.
This one is definitely wrong.
There was a problem hiding this comment.
This one is wrong as well.
There was a problem hiding this comment.
This one as well, but this one is different from the other 2.
| @@ -6,7 +6,7 @@ | |||
| extern crate test_macros; | |||
|
|
|||
| #[derive(Empty)] | |||
| #[empty_helper] //~ ERROR cannot find attribute `empty_helper` in this scope | |||
| #[empty_helper] | |||
There was a problem hiding this comment.
there is a definition in auxiliary/test-macros.rs:
#[proc_macro_derive(Empty, attributes(empty_helper))]
pub fn empty_derive(_: TokenStream) -> TokenStream {
TokenStream::new()
}So maybe it is correct? Or do these attributes only work inside of the struct?
There was a problem hiding this comment.
This looks like a fix from moving the prelude setting to build_reduced_graph.
There was a problem hiding this comment.
Yes indeed, also visible on my new branch.
|
Moving |
|
I'll create a pr for it. |
| Vec<(Module<'ra>, BindingKey, NameBinding<'ra>, bool /* warn_ambiguity */)>, | ||
| glob_path_res: Vec<(NodeId, PartialRes)>, | ||
| single_import_bindings: PerNS<Vec<(Module<'ra>, Import<'ra>, PendingBinding<'ra>)>>, | ||
| } |
There was a problem hiding this comment.
I suggest restructuring this structure like this:
struct ImportResolutionOutputs {
indeterminate_imports: Vec<Import>,
determined_imports: Vec<(Import, SideEffect)>,
}where SideEffect is a set of changes that need to be applied for that specific import.
Then side effects will be applied in the same order in which the imports are resolved.
It will avoid having superfluous differences with the old algorithm, in emitted diagnostics in particular, and should make debugging the remaining differences easier.
There was a problem hiding this comment.
Oh, nice. That sounds better indeed, thanks!
There was a problem hiding this comment.
This way the diagnostics will also go in the source code order in common case, which is nice.
There was a problem hiding this comment.
And we would thus not need those changes to the stderr files of some tests, very nice.
petrochenkov
added
S-waiting-on-author
|
I'm just pushing since it's almost night where I am. It doesn't build stdlib atm. |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Transforms the current algorithm for resolving imports to a batched algorithm. Every import in the
indeterminate_importsset is resolved in isolation. This is the only real difference from the current algorithm.r? petrochenkov