only resolve top-level guard patterns' guards once #141267
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
We resolve guard patterns' guards in `resolve_pattern_inner`, so to avoid resolving them multiple times, we must avoid doing so earlier. To accomplish this, `LateResolutionVisitor::visit_pat` contains a case for guard patterns that avoids visiting their guards while walking patterns. This fixes an ICE due to `visit::walk_pat` being used instead, which meant guards at the top level of a pattern would be visited twice.
rustbot
added
S-waiting-on-review
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 21, 2025
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#141267 (only resolve top-level guard patterns' guards once) - rust-lang#141280 (Use Docker cache from the current repository) - rust-lang#141296 (Async drop fix for 'broken mir, place has deref as later projection') - rust-lang#141328 (When AsyncDrop impl is empty, sync drop generated in elaborator) - rust-lang#141332 (Do not eagerly fold consts in `normalize_param_env_or_error` if new solver) - rust-lang#141333 (Use `DeepRejectCtxt` in `assemble_inherent_candidates_from_param`) - rust-lang#141334 (eagerly check nested obligations when coercing fndefs) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 21, 2025
Rollup merge of rust-lang#141267 - dianne:fix-141265, r=oli-obk only resolve top-level guard patterns' guards once We resolve guard patterns' guards in `resolve_pattern_inner`, so to avoid resolving them multiple times, we must avoid doing so earlier. To accomplish this, `LateResolutionVisitor::visit_pat` contains a case for guard patterns that avoids visiting their guards while walking patterns. This PR fixes rust-lang#141265, which was due to `visit::walk_pat` being used instead; this meant guards at the top level of a pattern would be visited twice. e.g. it would ICE on `for x if x in [] {}`, but not `for (x if x) in [] {}`. `visit_pat` was already used for the guard pattern in the second example, on account of the top-level pattern being parens.
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.
We resolve guard patterns' guards in
resolve_pattern_inner, so to avoid resolving them multiple times, we must avoid doing so earlier. To accomplish this,LateResolutionVisitor::visit_patcontains a case for guard patterns that avoids visiting their guards while walking patterns.This PR fixes #141265, which was due to
visit::walk_patbeing used instead; this meant guards at the top level of a pattern would be visited twice. e.g. it would ICE onfor x if x in [] {}, but notfor (x if x) in [] {}.visit_patwas already used for the guard pattern in the second example, on account of the top-level pattern being parens.