Skip to content

Commit 5b3b6b8

Browse files
committed
Make the parser TokenStream more resilient after mismatched delimiter recovery
1 parent 4bc1ce7 commit 5b3b6b8

File tree

3 files changed

+38
-0
lines changed

3 files changed

+38
-0
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7670,6 +7670,9 @@ impl<'a> Parser<'a> {
76707670
let ret = f(self);
76717671
let last_token = if self.token_cursor.stack.len() == prev {
76727672
&mut self.token_cursor.frame.last_token
7673+
} else if self.token_cursor.stack.is_empty() {//&& !self.unclosed_delims.is_empty() {
7674+
// This can happen with mismatched delimiters (#62881)
7675+
return Ok((ret?, TokenStream::new(vec![])));
76737676
} else {
76747677
&mut self.token_cursor.stack[prev].last_token
76757678
};

src/test/ui/issues/issue-62881.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fn main() {}
2+
3+
fn f() -> isize { fn f() -> isize {} pub f<
4+
//~^ ERROR missing `fn` or `struct` for function or struct definition
5+
//~| ERROR mismatched types
6+
//~ ERROR this file contains an un-closed delimiter

src/test/ui/issues/issue-62881.stderr

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
error: this file contains an un-closed delimiter
2+
--> $DIR/issue-62881.rs:6:53
3+
|
4+
LL | fn f() -> isize { fn f() -> isize {} pub f<
5+
| - un-closed delimiter
6+
...
7+
LL |
8+
| ^
9+
10+
error: missing `fn` or `struct` for function or struct definition
11+
--> $DIR/issue-62881.rs:3:41
12+
|
13+
LL | fn f() -> isize { fn f() -> isize {} pub f<
14+
| ^
15+
16+
error[E0308]: mismatched types
17+
--> $DIR/issue-62881.rs:3:29
18+
|
19+
LL | fn f() -> isize { fn f() -> isize {} pub f<
20+
| - ^^^^^ expected isize, found ()
21+
| |
22+
| this function's body doesn't return
23+
|
24+
= note: expected type `isize`
25+
found type `()`
26+
27+
error: aborting due to 3 previous errors
28+
29+
For more information about this error, try `rustc --explain E0308`.

0 commit comments

Comments
 (0)