Add suggestion to remove if in let..else block #107213

edward-shen · 2023-01-23T00:17:06Z

Adds an additional hint to failures where we encounter an else keyword while we're parsing an if-let expression.

This is likely that the user has accidentally mixed if-let and let..else together.

Fixes #103791.

rustbot · 2023-01-23T00:17:15Z

r? @eholk

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-01-23T00:17:18Z

rustc_error_messages was changed

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

edward-shen · 2023-01-23T00:25:57Z

tests/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.stderr

+help: There may be an extra `if` before the `let...else`
+  --> $DIR/ensure-that-let-else-does-not-interact-with-let-chains.rs:24:5
+   |
+LL |     if let Some(n) = opt else {
+   |     ^^


Related test source code: rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.rs.

This behavior is correct as this hint should only appear when it is ambiguous if the user is try to use an if-let or an let..else.

The other two cases that this test handles are:

if let Some(n) = opt && n == 1 else { //~^ ERROR this `if` expression is missing a block after the condition return; }; if let Some(n) = opt && let another = n else { //~^ ERROR this `if` expression is missing a block after the condition return; };

which are less ambiguous.

This also indicates that we don't emit this help on while-let -- this wasn't in scope of the original issue so I took a conservative approach in this PR.

compiler-errors · 2023-01-23T05:05:23Z

I can take a look at this tomorrow.

r? @compiler-errors

tests/ui/let-else/accidental-if.stderr

rustbot · 2023-01-23T08:58:29Z

rustc_error_messages was changed

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

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

compiler-errors

This looks pretty good to me as is. Please address nits (or tell me why I'm wrong 😆) and I think this can get r+'d soon.

compiler/rustc_parse/src/errors.rs

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

Adds an additional hint to failures where we encounter an else keyword while we're parsing an if-let block. This is likely that the user has accidentally mixed if-let and let...else together.

compiler-errors · 2023-01-24T05:01:52Z

@bors r+ rollup

bors · 2023-01-24T05:01:54Z

📌 Commit a8b77cf has been approved by compiler-errors

It is now in the queue for this repository.

…ntal-let-else, r=compiler-errors Add suggestion to remove if in let..else block Adds an additional hint to failures where we encounter an else keyword while we're parsing an if-let expression. This is likely that the user has accidentally mixed if-let and let..else together. Fixes rust-lang#103791.

Rollup of 9 pull requests Successful merges: - rust-lang#105552 (Add help message about function pointers) - rust-lang#106583 (Suggest coercion of `Result` using `?`) - rust-lang#106767 (Allow setting CFG_DISABLE_UNSTABLE_FEATURES to 0) - rust-lang#106823 (Allow fmt::Arguments::as_str() to return more Some(_).) - rust-lang#107166 (rustc_metadata: Support non-`Option` nullable values in metadata tables) - rust-lang#107213 (Add suggestion to remove if in let..else block) - rust-lang#107223 (`sub_ptr()` is equivalent to `usize::try_from().unwrap_unchecked()`, not `usize::from().unwrap_unchecked()`) - rust-lang#107227 (`new_outside_solver` -> `evaluate_root_goal`) - rust-lang#107232 (rustdoc: simplify settings popover DOM, CSS, JS) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

compiler/rustc_parse/src/errors.rs

est31 · 2023-01-30T21:17:25Z

compiler/rustc_parse/src/parser/expr.rs

+    IfExpressionMissingThenBlockSub, InvalidBlockMacroSegment, InvalidComparisonOperator,
+    InvalidComparisonOperatorSub, InvalidInterpolatedExpression, InvalidLiteralSuffixOnTupleIndex,
+    InvalidLogicalOperator, InvalidLogicalOperatorSub, LabeledLoopInBreak, LeadingPlusNotSupported,
+    LeftArrowOperator, LifetimeInBorrowExpression, MacroInvocationWithQualifiedPath,


This is horrible noise. Can't one instead use crate::errors::ErrorName instead all over the file? I'm asking this as a general pattern.

Alternatively, let's replace this with a glob import

Note: this is nothing that this particular PR has caused. The pattern of having a giant use at the top just creates this noise in PRs like this.

Let's discuss it on zulip.

…nd-2, r=estebank Make the "extra if in let...else block" hint a suggestion Changes the hint to a suggestion, suggested in rust-lang#107213. r? `@estebank`

…nd-2, r=estebank Make the "extra if in let...else block" hint a suggestion Changes the hint to a suggestion, suggested in rust-lang#107213. r? ``@estebank``

…nd-2, r=estebank Make the "extra if in let...else block" hint a suggestion Changes the hint to a suggestion, suggested in rust-lang#107213. r? ```@estebank```

rustbot assigned eholk Jan 23, 2023

edward-shen commented Jan 23, 2023

View reviewed changes

rustbot assigned compiler-errors and unassigned eholk Jan 23, 2023

est31 reviewed Jan 23, 2023

View reviewed changes

tests/ui/let-else/accidental-if.stderr Outdated Show resolved Hide resolved

edward-shen force-pushed the edward-shen/fix-accidental-let-else branch from 0a13106 to e2ea394 Compare January 23, 2023 08:58

Rageking8 reviewed Jan 23, 2023

View reviewed changes

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

edward-shen force-pushed the edward-shen/fix-accidental-let-else branch 2 times, most recently from 312358b to f76990e Compare January 23, 2023 18:13

compiler-errors reviewed Jan 23, 2023

View reviewed changes

compiler/rustc_parse/src/errors.rs Outdated Show resolved Hide resolved

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

edward-shen force-pushed the edward-shen/fix-accidental-let-else branch from f76990e to e6d7264 Compare January 24, 2023 04:21

compiler-errors reviewed Jan 24, 2023

View reviewed changes

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

edward-shen force-pushed the edward-shen/fix-accidental-let-else branch from e6d7264 to 94a5325 Compare January 24, 2023 04:31

Add suggestion to remove if in let...else block

a8b77cf

Adds an additional hint to failures where we encounter an else keyword while we're parsing an if-let block. This is likely that the user has accidentally mixed if-let and let...else together.

edward-shen force-pushed the edward-shen/fix-accidental-let-else branch from 94a5325 to a8b77cf Compare January 24, 2023 04:33

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 Jan 24, 2023

Dylan-DPC mentioned this pull request Jan 24, 2023

Rollup of 7 pull requests #107249

Closed

Dylan-DPC mentioned this pull request Jan 25, 2023

Rollup of 9 pull requests #107290

Merged

bors merged commit 4e2b5d1 into rust-lang:master Jan 25, 2023

rustbot added this to the 1.69.0 milestone Jan 25, 2023

edward-shen deleted the edward-shen/fix-accidental-let-else branch January 25, 2023 21:17

estebank reviewed Jan 30, 2023

View reviewed changes

compiler/rustc_parse/src/errors.rs Show resolved Hide resolved

est31 reviewed Jan 30, 2023

View reviewed changes

edward-shen mentioned this pull request Jan 30, 2023

Make the "extra if in let...else block" hint a suggestion #107487

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add suggestion to remove if in let..else block #107213

Add suggestion to remove if in let..else block #107213

edward-shen commented Jan 23, 2023 •

edited

Loading

rustbot commented Jan 23, 2023

rustbot commented Jan 23, 2023

edward-shen Jan 23, 2023 •

edited

Loading

compiler-errors commented Jan 23, 2023

rustbot commented Jan 23, 2023

compiler-errors left a comment

compiler-errors commented Jan 24, 2023

bors commented Jan 24, 2023

est31 Jan 30, 2023

compiler-errors Jan 30, 2023

est31 Jan 30, 2023

est31 Jan 30, 2023

Add suggestion to remove if in let..else block #107213

Add suggestion to remove if in let..else block #107213

Conversation

edward-shen commented Jan 23, 2023 • edited Loading

rustbot commented Jan 23, 2023

rustbot commented Jan 23, 2023

edward-shen Jan 23, 2023 • edited Loading

Choose a reason for hiding this comment

compiler-errors commented Jan 23, 2023

rustbot commented Jan 23, 2023

compiler-errors left a comment

Choose a reason for hiding this comment

compiler-errors commented Jan 24, 2023

bors commented Jan 24, 2023

est31 Jan 30, 2023

Choose a reason for hiding this comment

compiler-errors Jan 30, 2023

Choose a reason for hiding this comment

est31 Jan 30, 2023

Choose a reason for hiding this comment

est31 Jan 30, 2023

Choose a reason for hiding this comment

edward-shen commented Jan 23, 2023 •

edited

Loading

edward-shen Jan 23, 2023 •

edited

Loading