resolve: Preserve binding scopes in ambiguity errors #150445
Merged
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
It allows to get rid of `AmbiguityErrorMisc` and `Flags`.
Collaborator
|
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. |
Collaborator
|
r? @nnethercote rustbot has assigned @nnethercote. Use |
nnethercote
approved these changes
Jan 1, 2026
Contributor
|
Nice cleanup. @bors r+ |
Collaborator
rust-timer
added a commit
that referenced
this pull request
Jan 2, 2026
Rollup merge of #150445 - petrochenkov:keepscope, r=nnethercote resolve: Preserve binding scopes in ambiguity errors It allows to get rid of `AmbiguityErrorMisc`, `Flags` and `extern_prelude_flag_binding`. Also keep all encountered bindings in `resolve_ident_in_scope_set`, it allows to get rid of `extern_prelude_item_binding`. This also unblocks #149681 because the newly preserved data will help to fix the regressions in #149681 (comment) in a reasonable way.
Collaborator
Member
|
@bors retry r- (sync) |
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jan 13, 2026
resolve: Refactor away the side table `decl_parent_modules` Instead keep parent modules in `DeclData` itself. Follow up to rust-lang#150445. r? @nnethercote
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jan 14, 2026
resolve: Refactor away the side table `decl_parent_modules` Instead keep parent modules in `DeclData` itself. Follow up to rust-lang#150445. r? @nnethercote
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jan 14, 2026
resolve: Refactor away the side table `decl_parent_modules` Instead keep parent modules in `DeclData` itself. Follow up to rust-lang#150445. r? @nnethercote
rust-timer
added a commit
that referenced
this pull request
Jan 14, 2026
Rollup merge of #150877 - declmod, r=nnethercote resolve: Refactor away the side table `decl_parent_modules` Instead keep parent modules in `DeclData` itself. Follow up to #150445. r? @nnethercote
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
It allows to get rid of
AmbiguityErrorMisc,Flagsandextern_prelude_flag_binding.Also keep all encountered bindings in
resolve_ident_in_scope_set, it allows to get rid ofextern_prelude_item_binding.This also unblocks #149681 because the newly preserved data will help to fix the regressions in #149681 (comment) in a reasonable way.