resolve: Split Scope::Module into two scopes for non-glob and glob bindings
#149681
+192
−159
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-review
Collaborator
|
r? @davidtwco rustbot has assigned @davidtwco. Use |
Contributor
Author
|
There may be minor breakage in corner cases due to ambiguity checking being unified between in-scope resolution and in-module resolution, so this needs a crater run. |
This comment has been minimized.
This comment has been minimized.
rust-bors bot
added a commit
that referenced
this pull request
Dec 5, 2025
resolve: Split `Scope::Module` into two scopes for non-glob and glob bindings
petrochenkov
added
S-waiting-on-crater
petrochenkov
commented
Dec 5, 2025
| && glob_binding.res() != non_glob_binding.res() | ||
| { | ||
| resolution.non_glob_binding = Some(this.new_ambiguity_binding( | ||
| AmbiguityKind::GlobVsExpanded, |
Contributor
Author
There was a problem hiding this comment.
@yaahc you may be interested, this PR removes one of the "gray areas".
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment was marked as resolved.
This comment was marked as resolved.
petrochenkov
added
S-waiting-on-author
…d the innermost binding. Previously we could lose the already found binding and break with an error, if some blocking error was found in the shadowed scopes. Also, avoid some impossible state in the return type of `fn resolve_ident_in_scope`.
in the same module to the usual ambiguity infra in `resolve_ident_in_scope_set`
for looking up a name in two scopes insice a module - non-glob and glob bindings.
…ings in the same module to the usual ambiguity infra in `resolve_ident_in_scope_set`
petrochenkov
force-pushed
the
openapi1
branch
from
fdaf022 to
1b2b0da
Compare
Collaborator
|
This PR was rebased onto a different main 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. |
Contributor
Author
|
@bors try |
rust-bors bot
added a commit
that referenced
this pull request
Dec 6, 2025
resolve: Split `Scope::Module` into two scopes for non-glob and glob bindings
This comment has been minimized.
This comment has been minimized.
petrochenkov
removed
the
S-waiting-on-author
petrochenkov
added
the
S-waiting-on-crater
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
This is a re-implementation of #144131 with all the issues mentioned there fixed.
As it turned out, the non-trivial part of the split was already done in c91b6ca, so the remaining part implemented in this PR is mostly mechanical.
After addressing the issue of already found bindings being lost due to indeterminacies in outer scopes (7e890bf) and adding one missing
Stage::LateinFinalizethe scope splitting refactoring just worked.(One more ICE was revealed by the refactoring, but not caused by it, fixed up in the last commit.)
This is a part of implementation for the Open API proposal.