Avoid &raw call recovery inside nested delimiters#157888
Merged
rust-bors[bot] merged 2 commits intoJun 14, 2026
Merged
Conversation
Collaborator
|
The parser was modified, potentially altering the grammar of (stable) Rust cc @fmease |
rustbot
added
S-waiting-on-review
Collaborator
|
r? @folkertdev rustbot has assigned @folkertdev. Use Why was this reviewer chosen?The reviewer was selected based on:
|
TaKO8Ki
force-pushed
the
fix-raw-ref-nested-call-arg-recover
branch
from
9d91d02 to
33d1436
Compare
Collaborator
|
A job failed! Check out the build log: (web) (plain enhanced) (plain) Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
Nice! @bors r+ rollup |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
rust-bors Bot
pushed a commit
that referenced
this pull request
Jun 14, 2026
…uwer Rollup of 5 pull requests Successful merges: - #157677 (Slightly improve diagnostic impl+output for uncovered type parameters) - #157715 (Stop using a fn pointer to normalize_fn_sig inside TypeErrCtxt) - #157884 (Rename `errors.rs` file to `diagnostics.rs` (9/N)) - #157887 (Rename `diagnostic::on_unmatch_args` to `diagnostic::on_unmatched_args`) - #157888 (Avoid `&raw` call recovery inside nested delimiters)
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
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.
Fixes #157853
The
&raw <expr>recovery is only valid for malformed raw refs directly in the call argument list. When it handled the nested array case, it tried to skip tokens until the call's ), reached the nested ], and could ICE in parse_token_tree.This PR scopes the call-argument recovery to the call's delimiter depth and makes the recovery loop stop before any closing delimiter or EOF.