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.

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

Fix ICE in suggestion caused by being recovered as == #127835

Merged
merged 1 commit into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions compiler/rustc_parse/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,8 @@ pub(crate) struct RemoveLet {
#[diag(parse_use_eq_instead)]
pub(crate) struct UseEqInstead {
#[primary_span]
#[suggestion(style = "verbose", applicability = "machine-applicable", code = "=")]
pub span: Span,
#[suggestion(style = "verbose", applicability = "machine-applicable", code = "")]
pub suggestion: Span,
}

#[derive(Diagnostic)]
Expand Down
5 changes: 1 addition & 4 deletions compiler/rustc_parse/src/parser/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -566,10 +566,7 @@ impl<'a> Parser<'a> {
&& expected.iter().any(|tok| matches!(tok, TokenType::Token(TokenKind::Eq)))
{
// Likely typo: `=` → `==` in let expr or enum item
return Err(self.dcx().create_err(UseEqInstead {
span: self.token.span,
suggestion: self.token.span.with_lo(self.token.span.lo() + BytePos(1)),
}));
return Err(self.dcx().create_err(UseEqInstead { span: self.token.span }));
}

if self.token.is_keyword(kw::Move) && self.prev_token.is_keyword(kw::Async) {
Expand Down
5 changes: 2 additions & 3 deletions tests/ui/parser/issues/issue-101477-enum.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ LL | B == 2
= help: enum variants can be `Variant`, `Variant = <integer>`, `Variant(Type, ..., TypeN)` or `Variant { fields: Types }`
help: try using `=` instead
|
LL - B == 2
LL + B = 2
|
LL | B = 2
| ~

error: expected item, found `==`
--> $DIR/issue-101477-enum.rs:6:7
Expand Down
5 changes: 2 additions & 3 deletions tests/ui/parser/issues/issue-101477-let.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ LL | let x == 2;
|
help: try using `=` instead
|
LL - let x == 2;
LL + let x = 2;
|
LL | let x = 2;
| ~

error: aborting due to 1 previous error

3 changes: 3 additions & 0 deletions tests/ui/parser/recover/unicode-double-equals-recovery.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const A: usize2;
//~^ ERROR unknown start of token: \u{2a75}
//~| ERROR unexpected `==`
24 changes: 24 additions & 0 deletions tests/ui/parser/recover/unicode-double-equals-recovery.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
error: unknown start of token: \u{2a75}
--> $DIR/unicode-double-equals-recovery.rs:1:16
|
LL | const A: usize ⩵ 2;
| ^
|
help: Unicode character '⩵' (Two Consecutive Equals Signs) looks like '==' (Double Equals Sign), but it is not
|
LL | const A: usize == 2;
| ~~

error: unexpected `==`
--> $DIR/unicode-double-equals-recovery.rs:1:16
|
LL | const A: usize ⩵ 2;
| ^
|
help: try using `=` instead
|
LL | const A: usize = 2;
| ~

error: aborting due to 2 previous errors

Loading