Skip to content

Commit

Permalink
Fix ICE rust-lang#90993: add missing call to cancel
Browse files Browse the repository at this point in the history
  • Loading branch information
Badel2 committed Nov 20, 2021
1 parent 3d78974 commit 77a105c
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/rustc_parse/src/parser/pat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ impl<'a> Parser<'a> {
// Ensure the user doesn't receive unhelpful unexpected token errors
self.bump();
if self.is_pat_range_end_start(0) {
let _ = self.parse_pat_range_end();
let _ = self.parse_pat_range_end().map_err(|mut e| e.cancel());
}

self.error_inclusive_range_with_extra_equals(span_with_eq);
Expand Down
6 changes: 6 additions & 0 deletions src/test/ui/parser/issue-90993.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
fn main() {
...=.
//~^ ERROR: unexpected token: `...`
//~| ERROR: unexpected `=` after inclusive range
//~| ERROR: expected one of `-`, `;`, `}`, or path, found `.`
}
31 changes: 31 additions & 0 deletions src/test/ui/parser/issue-90993.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
error: unexpected token: `...`
--> $DIR/issue-90993.rs:2:5
|
LL | ...=.
| ^^^
|
help: use `..` for an exclusive range
|
LL | ..=.
| ~~
help: or `..=` for an inclusive range
|
LL | ..==.
| ~~~

error: unexpected `=` after inclusive range
--> $DIR/issue-90993.rs:2:5
|
LL | ...=.
| ^^^^ help: use `..=` instead
|
= note: inclusive ranges end with a single equals sign (`..=`)

error: expected one of `-`, `;`, `}`, or path, found `.`
--> $DIR/issue-90993.rs:2:9
|
LL | ...=.
| ^ expected one of `-`, `;`, `}`, or path

error: aborting due to 3 previous errors

0 comments on commit 77a105c

Please sign in to comment.