Recover from typo where == is used in place of = by chenyukang · Pull Request #101515 · rust-lang/rust

chenyukang · 2022-09-07T04:31:13Z

Fixes #101477

rust-highfive · 2022-09-07T04:31:16Z

r? @fee1-dead

(rust-highfive has picked a reviewer for you, use r? to override)

fee1-dead

Nice work! LGTM pending error message improvements. Also, could this be using SessionDiagnostics instead? cc @davidtwco

fee1-dead · 2022-09-07T12:53:21Z

compiler/rustc_parse/src/parser/diagnostics.rs

Suggested change

let mut err = self.struct_span_err(self.token.span, "expect `=`, found `==`");

err.span_suggestion_short(self.token.span, "write `=` instead of `==`", "=", appl)

let mut err = self.struct_span_err(self.token.span, "unexpected `==`");

err.span_suggestion_short(self.token.span, "try using `=` instead", "=", appl)

SessionDiagnostic will print the suggestion in the same line, so it will print like this:

error: unexpected `==` --> src/test/ui/parser/issue-101477-enum.rs:6:7 | 6 | B == 2 //~ ERROR unexpected `==` | ^^ help: try using `=` instead `==`: `=`

I think it's better in this format?

error: unexpected `==` --> src/test/ui/parser/issue-101477-enum.rs:6:7 | 6 | B == 2 //~ ERROR unexpected `==` | ^^ help: replace `==` with a equal symbol: `=`

Resolved with @compiler-errors with advices.

davidtwco · 2022-09-07T13:01:16Z

Also, could this be using SessionDiagnostics instead? cc @davidtwco

This could absolutely use SessionDiagnostic, I'd appreciate it if it did - see #100717.

chenyukang · 2022-09-07T16:13:28Z

Also, could this be using SessionDiagnostics instead? cc @davidtwco

This could absolutely use SessionDiagnostic, I'd appreciate it if it did - see #100717.

@davidtwco
I'm fixing it to use SessionDiagnostic, I have a question when using it:

How can I keep returning an Err to avoid extra useless diagnostics?

-            let mut err = self.struct_span_err(self.token.span, "unexpected `==`");
-            err.span_suggestion_short(self.token.span, "try using `=` instead `==`", "=", appl)
-                .emit();
-            return Err(err);
+            self.sess.emit_err(UseEqInstead { span: self.token.span });
+            return Ok(true);

I use return Ok now and there will be a extra diagnostics which I want to remove.

--- a/src/test/ui/parser/issue-101477-let.stderr
+++ b/src/test/ui/parser/issue-101477-let.stderr
@@ -2,7 +2,13 @@ error: unexpected `==`
   --> $DIR/issue-101477-let.rs:4:11
    |
 LL |     let x == 2;
-   |           ^^ help: try using `=` instead `==`
+   |           ^^ help: replace `==` with a equal symbol: `=`

-error: aborting due to previous error
+error: expected expression, found `==`
+  --> $DIR/issue-101477-let.rs:4:11
+   |
+LL |     let x == 2;
+   |           ^^ expected expression
+
+error: aborting due to 2 previous errors

chenyukang · 2022-09-07T16:16:52Z

Seems we use this struct to avoid later errors:

/// Useful type to use with `Result<>` indicate that an error has already
/// been reported to the user, so no need to continue checking.
#[derive(Clone, Copy, Debug, Encodable, Decodable, Hash, PartialEq, Eq, PartialOrd, Ord)]
#[derive(HashStable_Generic)]
pub struct ErrorGuaranteed(());

But parse_let_expr is:

 fn parse_let_expr(&mut self) -> PResult<'a, P<Expr>> {
        ...

        self.expect(&token::Eq)?;
        
        ...
        Ok(self.mk_expr(span, ExprKind::Let(pat, expr, span)))
    }

chenyukang · 2022-09-08T02:37:19Z

Got it:

  let mut err = self.sess.create_err(UseEqInstead { span: self.token.span });
  err.emit();
  return Err(err);

rustbot · 2022-09-08T03:31:48Z

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

compiler/rustc_parse/src/parser/diagnostics.rs

compiler/rustc_error_messages/locales/en-US/parser.ftl

fee1-dead · 2022-09-08T08:23:17Z

@bors r+

bors · 2022-09-08T08:23:19Z

📌 Commit ddb225f has been approved by fee1-dead

It is now in the queue for this repository.

Recover from typo where == is used in place of = Fixes rust-lang#101477

Rollup of 7 pull requests Successful merges: - rust-lang#98933 (Opaque types' generic params do not imply anything about their hidden type's lifetimes) - rust-lang#101041 (translations(rustc_session): migrates rustc_session to use SessionDiagnostic - Pt. 2) - rust-lang#101424 (Adjust and slightly generalize operator error suggestion) - rust-lang#101496 (Allow lower_lifetime_binder receive a closure) - rust-lang#101501 (Allow lint passes to be bound by `TyCtxt`) - rust-lang#101515 (Recover from typo where == is used in place of =) - rust-lang#101545 (Remove unnecessary `PartialOrd` and `Ord`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned fee1-dead Sep 7, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 7, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 7, 2022

This comment has been minimized.

Sign in to view

chenyukang force-pushed the fix-101477 branch from f9fd237 to f3e9893 Compare September 7, 2022 05:14

fee1-dead reviewed Sep 7, 2022

View reviewed changes

chenyukang force-pushed the fix-101477 branch from f3e9893 to 04ef874 Compare September 8, 2022 03:31

rustbot added the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Sep 8, 2022

compiler-errors reviewed Sep 8, 2022

View reviewed changes

compiler/rustc_parse/src/parser/diagnostics.rs Outdated Show resolved Hide resolved

compiler/rustc_parse/src/parser/diagnostics.rs Outdated Show resolved Hide resolved

compiler/rustc_error_messages/locales/en-US/parser.ftl Outdated Show resolved Hide resolved

fixes rust-lang#101477: Recover from typo where == is used in place of =

ddb225f

chenyukang force-pushed the fix-101477 branch from 04ef874 to ddb225f Compare September 8, 2022 07:15

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 8, 2022

Dylan-DPC mentioned this pull request Sep 8, 2022

Rollup of 6 pull requests #101575

Closed

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 8, 2022

Rollup merge of rust-lang#101515 - chenyukang:fix-101477, r=fee1-dead

2fabb76

Recover from typo where == is used in place of = Fixes rust-lang#101477

Dylan-DPC mentioned this pull request Sep 8, 2022

Rollup of 7 pull requests #101576

Closed

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 8, 2022

Rollup merge of rust-lang#101515 - chenyukang:fix-101477, r=fee1-dead

823e597

Recover from typo where == is used in place of = Fixes rust-lang#101477

Dylan-DPC mentioned this pull request Sep 8, 2022

Rollup of 7 pull requests #101577

Merged

bors merged commit 8d2a492 into rust-lang:master Sep 8, 2022

rustbot added this to the 1.65.0 milestone Sep 8, 2022

-            let mut err = self.struct_span_err(self.token.span, "expect `=`, found `==`");
-            err.span_suggestion_short(self.token.span, "write `=` instead of `==`", "=", appl)
+            let mut err = self.struct_span_err(self.token.span, "unexpected `==`");
+            err.span_suggestion_short(self.token.span, "try using `=` instead", "=", appl)

Uh oh!

Conversation

chenyukang commented Sep 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Sep 7, 2022

Uh oh!

This comment has been minimized.

fee1-dead left a comment

Choose a reason for hiding this comment

Uh oh!

fee1-dead Sep 7, 2022

Choose a reason for hiding this comment

Uh oh!

chenyukang Sep 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chenyukang Sep 8, 2022

Choose a reason for hiding this comment

Uh oh!

davidtwco commented Sep 7, 2022

Uh oh!

chenyukang commented Sep 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chenyukang commented Sep 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chenyukang commented Sep 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 8, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fee1-dead commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

chenyukang commented Sep 7, 2022 •

edited

Loading

chenyukang Sep 8, 2022 •

edited

Loading

chenyukang commented Sep 7, 2022 •

edited

Loading

chenyukang commented Sep 7, 2022 •

edited

Loading

chenyukang commented Sep 8, 2022 •

edited

Loading