diff options
| author | bors <bors@rust-lang.org> | 2021-09-24 11:54:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-24 11:54:29 +0000 |
| commit | a0648eab3686f100c7ab9b0d38472c740079cce4 (patch) | |
| tree | 2f0983f6033f3a568ab04ada0bfe7be61fee121d /compiler/rustc_codegen_llvm/src | |
| parent | 91d8da1f4ba24679e92b7939a26c681a5d2d3548 (diff) | |
| parent | a8421cacfec5798f600549508545b85003c2143c (diff) | |
| download | rust-a0648eab3686f100c7ab9b0d38472c740079cce4.tar.gz rust-a0648eab3686f100c7ab9b0d38472c740079cce4.zip | |
Auto merge of #88835 - FabianWolff:issue-88770, r=petrochenkov
Fix error recovery in format macro parsing Fixes #88770. Basically, the assumption in the following comment is incorrect: https://github.com/rust-lang/rust/blob/b69fe57261086e70aea9d5b58819a1794bf7c121/compiler/rustc_builtin_macros/src/format.rs#L167-L172 This is only true in the first iteration of the loop, when [`p.clear_expected_tokens()`](https://github.com/rust-lang/rust/blob/b69fe57261086e70aea9d5b58819a1794bf7c121/compiler/rustc_builtin_macros/src/format.rs#L164) is called. In subsequent iterations, `p.expected_tokens` won't be empty, so `p.expect()` won't actually call `unexpected_try_recover()`: https://github.com/rust-lang/rust/blob/b69fe57261086e70aea9d5b58819a1794bf7c121/compiler/rustc_parse/src/parser/mod.rs#L487-L498 Instead, it will call `expect_one_of()`, which _can_ recover and return `Ok()`. This PR handles this case to fix the ICE in #88770.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
0 files changed, 0 insertions, 0 deletions