Fix error recovery in format macro parsing #88835
Merged
+94
−18
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 #88770. Basically, the assumption in the following comment is incorrect:
rust/compiler/rustc_builtin_macros/src/format.rs
Lines 167 to 172 in b69fe57
This is only true in the first iteration of the loop, when
p.clear_expected_tokens()
is called. In subsequent iterations,p.expected_tokens
won't be empty, sop.expect()
won't actually callunexpected_try_recover()
:rust/compiler/rustc_parse/src/parser/mod.rs
Lines 487 to 498 in b69fe57
Instead, it will call
expect_one_of()
, which can recover and returnOk()
. This PR handles this case to fix the ICE in #88770.