Skip to content

Commit

Permalink
Unrolled build for rust-lang#124169
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#124169 - compiler-errors:parser-fatal, r=oli-obk

Don't fatal when calling `expect_one_of` when recovering arg in `parse_seq`

In `parse_seq`, when parsing a sequence of token-separated items, if we don't see a separator, we try to parse another item eagerly in order to give a good diagnostic and recover from a missing separator:
https://github.com/rust-lang/rust/blob/d1a0fa5ed3ffe52d72f761d3c95cbeb0a9cdfe66/compiler/rustc_parse/src/parser/mod.rs#L900-L901

If parsing the item itself calls `expect_one_of`, then we will fatal because of rust-lang#58903:
https://github.com/rust-lang/rust/blob/d1a0fa5ed3ffe52d72f761d3c95cbeb0a9cdfe66/compiler/rustc_parse/src/parser/mod.rs#L513-L516

For `precise_capturing` feature I implemented, we do end up calling `expected_one_of`:
https://github.com/rust-lang/rust/blob/d1a0fa5ed3ffe52d72f761d3c95cbeb0a9cdfe66/compiler/rustc_parse/src/parser/ty.rs#L712-L714

This leads the compiler to fatal *before* having emitted the first error, leading to absolutely no useful information for the user about what happened in the parser.

This PR makes it so that we stop doing that.

Fixes rust-lang#124195
  • Loading branch information
rust-timer authored Apr 23, 2024
2 parents c2f2db7 + 2ef1552 commit ec04ef6
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 0 deletions.
1 change: 1 addition & 0 deletions compiler/rustc_parse/src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions tests/ui/impl-trait/precise-capturing/unexpected-token.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// We used to fatal error without any useful diagnostic when we had an unexpected
// token due to a strange interaction between the sequence parsing code and the
// param/lifetime parsing code.

fn hello() -> impl use<'a {}> Sized {}
//~^ ERROR expected one of `,` or `>`, found `{`
//~| ERROR expected item, found `>`

fn main() {}
16 changes: 16 additions & 0 deletions tests/ui/impl-trait/precise-capturing/unexpected-token.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
error: expected one of `,` or `>`, found `{`
--> $DIR/unexpected-token.rs:5:27
|
LL | fn hello() -> impl use<'a {}> Sized {}
| ^ expected one of `,` or `>`

error: expected item, found `>`
--> $DIR/unexpected-token.rs:5:29
|
LL | fn hello() -> impl use<'a {}> Sized {}
| ^ expected item
|
= note: for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>

error: aborting due to 2 previous errors

0 comments on commit ec04ef6

Please sign in to comment.