diff options
| author | bors <bors@rust-lang.org> | 2024-04-23 18:23:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-23 18:23:46 +0000 |
| commit | 40dcd796d094b911b8b7b55a0519fb8e3d21680f (patch) | |
| tree | 014f4957b4460b79e16fa0d34b62afcadb619b87 /compiler/rustc_parse | |
| parent | c2f2db79ca3024f68d22b45aa22b570775c2c4ad (diff) | |
| parent | a760954ca9823797660b07ed830dcf1eb8887e30 (diff) | |
| download | rust-40dcd796d094b911b8b7b55a0519fb8e3d21680f.tar.gz rust-40dcd796d094b911b8b7b55a0519fb8e3d21680f.zip | |
Auto merge of #124302 - matthiaskrgr:rollup-2aya8n8, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #124003 (Dellvmize some intrinsics (use `u32` instead of `Self` in some integer intrinsics)) - #124169 (Don't fatal when calling `expect_one_of` when recovering arg in `parse_seq`) - #124286 (Subtree sync for rustc_codegen_cranelift) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse')
| -rw-r--r-- | compiler/rustc_parse/src/parser/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs index cd8a5600c73..742f4bd3c83 100644 --- a/compiler/rustc_parse/src/parser/mod.rs +++ b/compiler/rustc_parse/src/parser/mod.rs @@ -895,6 +895,7 @@ impl<'a> Parser<'a> { } // Attempt to keep parsing if it was an omitted separator. + self.last_unexpected_token_span = None; match f(self) { Ok(t) => { // Parsed successfully, therefore most probably the code only |