Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Properly restore snapshot when failing to recover parsing ternary #117212

Merged
merged 2 commits into from
Oct 27, 2023
Merged

Properly restore snapshot when failing to recover parsing ternary #117212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
041f031
Properly restore snapshot when failing to recover parsing ternary
clubby789 Oct 26, 2023
e81a5c6
Recover ternary expression as error
clubby789 Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions compiler/rustc_parse/src/parser/diagnostics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,10 @@ impl<'a> Parser<'a> {

// Special-case "expected `;`" errors
if expected.contains(&TokenType::Token(token::Semi)) {
if self.prev_token == token::Question && self.maybe_recover_from_ternary_operator() {
return Ok(true);
// If the user is trying to write a ternary expression, recover it and
// return an Err to prevent a cascade of irrelevant diagnostics
if self.prev_token == token::Question && let Err(e) = self.maybe_recover_from_ternary_operator() {
return Err(e);
}

if self.token.span == DUMMY_SP || self.prev_token.span == DUMMY_SP {
Expand Down Expand Up @@ -1428,10 +1430,10 @@ impl<'a> Parser<'a> {

/// Rust has no ternary operator (`cond ? then : else`). Parse it and try
/// to recover from it if `then` and `else` are valid expressions. Returns
/// whether it was a ternary operator.
pub(super) fn maybe_recover_from_ternary_operator(&mut self) -> bool {
/// an err if this appears to be a ternary expression.
pub(super) fn maybe_recover_from_ternary_operator(&mut self) -> PResult<'a, ()> {
if self.prev_token != token::Question {
return false;
return PResult::Ok(());
}

let lo = self.prev_token.span.lo();
Expand All @@ -1449,20 +1451,18 @@ impl<'a> Parser<'a> {
if self.eat_noexpect(&token::Colon) {
match self.parse_expr() {
Ok(_) => {
self.sess.emit_err(TernaryOperator { span: self.token.span.with_lo(lo) });
return true;
return Err(self
.sess
.create_err(TernaryOperator { span: self.token.span.with_lo(lo) }));
}
Err(err) => {
err.cancel();
self.restore_snapshot(snapshot);
}
};
}
} else {
self.restore_snapshot(snapshot);
};

false
}
self.restore_snapshot(snapshot);
Ok(())
}

pub(super) fn maybe_recover_from_bad_type_plus(&mut self, ty: &Ty) -> PResult<'a, ()> {
Expand Down
59 changes: 10 additions & 49 deletions tests/ui/parser/ternary_operator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,30 @@
// A good chunk of these errors aren't shown to the user, but are still
// required in the test for it to pass.

fn a() { //~ NOTE this function should return `Result` or `Option` to accept `?`
fn a() {
let x = 5 > 2 ? true : false;
//~^ ERROR Rust has no ternary operator
//~| HELP use an `if-else` expression instead
//~| ERROR the `?` operator can only be applied to values that implement `Try` [E0277]
//~| HELP the trait `Try` is not implemented for `{integer}`
//~| ERROR the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`) [E0277]
//~| HELP the trait `FromResidual<_>` is not implemented for `()`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE the `?` operator cannot be applied to type `{integer}`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE cannot use the `?` operator in a function that returns `()`
//~| NOTE in this expansion of desugaring of operator `?`
}

fn b() { //~ NOTE this function should return `Result` or `Option` to accept `?`
fn b() {
let x = 5 > 2 ? { true } : { false };
//~^ ERROR Rust has no ternary operator
//~| HELP use an `if-else` expression instead
//~| ERROR the `?` operator can only be applied to values that implement `Try` [E0277]
//~| HELP the trait `Try` is not implemented for `{integer}`
//~| ERROR the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`) [E0277]
//~| HELP the trait `FromResidual<_>` is not implemented for `()`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE the `?` operator cannot be applied to type `{integer}`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE cannot use the `?` operator in a function that returns `()`
//~| NOTE in this expansion of desugaring of operator `?`
}

fn c() { //~ NOTE this function should return `Result` or `Option` to accept `?`
fn c() {
let x = 5 > 2 ? f32::MAX : f32::MIN;
//~^ ERROR Rust has no ternary operator
//~| HELP use an `if-else` expression instead
//~| ERROR the `?` operator can only be applied to values that implement `Try` [E0277]
//~| HELP the trait `Try` is not implemented for `{integer}`
//~| ERROR the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`) [E0277]
//~| HELP the trait `FromResidual<_>` is not implemented for `()`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE the `?` operator cannot be applied to type `{integer}`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE cannot use the `?` operator in a function that returns `()`
//~| NOTE in this expansion of desugaring of operator `?`
}

fn main() { //~ NOTE this function should return `Result` or `Option` to accept `?`
fn bad() {
// regression test for #117208
v ? return;
//~^ ERROR expected one of
}

fn main() {
let x = 5 > 2 ? { let x = vec![]: Vec<u16>; x } : { false };
//~^ ERROR Rust has no ternary operator
//~| HELP use an `if-else` expression instead
//~| ERROR expected one of `.`, `;`, `?`, `else`, or an operator, found `:`
//~| NOTE expected one of `.`, `;`, `?`, `else`, or an operator
//~| ERROR the `?` operator can only be applied to values that implement `Try` [E0277]
//~| HELP the trait `Try` is not implemented for `{integer}`
//~| ERROR the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`) [E0277]
//~| HELP the trait `FromResidual<_>` is not implemented for `()`
//~| NOTE type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE the `?` operator cannot be applied to type `{integer}`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE in this expansion of desugaring of operator `?`
//~| NOTE cannot use the `?` operator in a function that returns `()`
//~| NOTE in this expansion of desugaring of operator `?`
}
91 changes: 12 additions & 79 deletions tests/ui/parser/ternary_operator.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,115 +1,48 @@
error: Rust has no ternary operator
--> $DIR/ternary_operator.rs:5:19
--> $DIR/ternary_operator.rs:2:19
|
LL | let x = 5 > 2 ? true : false;
| ^^^^^^^^^^^^^^^
|
= help: use an `if-else` expression instead

error: Rust has no ternary operator
--> $DIR/ternary_operator.rs:21:19
--> $DIR/ternary_operator.rs:8:19
|
LL | let x = 5 > 2 ? { true } : { false };
| ^^^^^^^^^^^^^^^^^^^^^^^
|
= help: use an `if-else` expression instead

error: Rust has no ternary operator
--> $DIR/ternary_operator.rs:37:19
--> $DIR/ternary_operator.rs:14:19
|
LL | let x = 5 > 2 ? f32::MAX : f32::MIN;
| ^^^^^^^^^^^^^^^^^^^^^^
|
= help: use an `if-else` expression instead

error: expected one of `.`, `;`, `?`, `}`, or an operator, found keyword `return`
--> $DIR/ternary_operator.rs:21:9
|
LL | v ? return;
| ^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator

error: expected one of `.`, `;`, `?`, `else`, or an operator, found `:`
--> $DIR/ternary_operator.rs:53:37
--> $DIR/ternary_operator.rs:26:37
|
LL | let x = 5 > 2 ? { let x = vec![]: Vec<u16>; x } : { false };
| ^ expected one of `.`, `;`, `?`, `else`, or an operator
|
= note: type ascription syntax has been removed, see issue #101728 <https://github.com/rust-lang/rust/issues/101728>

error: Rust has no ternary operator
--> $DIR/ternary_operator.rs:53:19
--> $DIR/ternary_operator.rs:26:19
|
LL | let x = 5 > 2 ? { let x = vec![]: Vec<u16>; x } : { false };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: use an `if-else` expression instead

error[E0277]: the `?` operator can only be applied to values that implement `Try`
--> $DIR/ternary_operator.rs:5:17
|
LL | let x = 5 > 2 ? true : false;
| ^^^ the `?` operator cannot be applied to type `{integer}`
|
= help: the trait `Try` is not implemented for `{integer}`

error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`)
--> $DIR/ternary_operator.rs:5:19
|
LL | fn a() {
| ------ this function should return `Result` or `Option` to accept `?`
LL | let x = 5 > 2 ? true : false;
| ^ cannot use the `?` operator in a function that returns `()`
|
= help: the trait `FromResidual<_>` is not implemented for `()`

error[E0277]: the `?` operator can only be applied to values that implement `Try`
--> $DIR/ternary_operator.rs:21:17
|
LL | let x = 5 > 2 ? { true } : { false };
| ^^^ the `?` operator cannot be applied to type `{integer}`
|
= help: the trait `Try` is not implemented for `{integer}`

error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`)
--> $DIR/ternary_operator.rs:21:19
|
LL | fn b() {
| ------ this function should return `Result` or `Option` to accept `?`
LL | let x = 5 > 2 ? { true } : { false };
| ^ cannot use the `?` operator in a function that returns `()`
|
= help: the trait `FromResidual<_>` is not implemented for `()`

error[E0277]: the `?` operator can only be applied to values that implement `Try`
--> $DIR/ternary_operator.rs:37:17
|
LL | let x = 5 > 2 ? f32::MAX : f32::MIN;
| ^^^ the `?` operator cannot be applied to type `{integer}`
|
= help: the trait `Try` is not implemented for `{integer}`

error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`)
--> $DIR/ternary_operator.rs:37:19
|
LL | fn c() {
| ------ this function should return `Result` or `Option` to accept `?`
LL | let x = 5 > 2 ? f32::MAX : f32::MIN;
| ^ cannot use the `?` operator in a function that returns `()`
|
= help: the trait `FromResidual<_>` is not implemented for `()`

error[E0277]: the `?` operator can only be applied to values that implement `Try`
--> $DIR/ternary_operator.rs:53:17
|
LL | let x = 5 > 2 ? { let x = vec![]: Vec<u16>; x } : { false };
| ^^^ the `?` operator cannot be applied to type `{integer}`
|
= help: the trait `Try` is not implemented for `{integer}`

error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`)
--> $DIR/ternary_operator.rs:53:19
|
LL | fn main() {
| --------- this function should return `Result` or `Option` to accept `?`
LL | let x = 5 > 2 ? { let x = vec![]: Vec<u16>; x } : { false };
| ^ cannot use the `?` operator in a function that returns `()`
|
= help: the trait `FromResidual<_>` is not implemented for `()`

error: aborting due to 13 previous errors
error: aborting due to 6 previous errors

For more information about this error, try `rustc --explain E0277`.
Loading