diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-05-25 10:48:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-25 10:48:30 +0200 |
| commit | fe727e4dfc560ad5c973d04cd4e98ea943b463de (patch) | |
| tree | a1cdad623abe3e4cb86b8c93d35669c7ff0e3f2b | |
| parent | ca269b1e797c7d5da4e90ba0bdb06eae7f3dcfd9 (diff) | |
| parent | d61d30d9a272f8c2cce374a6f8aca5ae5d3de124 (diff) | |
| download | rust-fe727e4dfc560ad5c973d04cd4e98ea943b463de.tar.gz rust-fe727e4dfc560ad5c973d04cd4e98ea943b463de.zip | |
Rollup merge of #97370 - compiler-errors:else-no-if-2, r=Dylan-DPC
Minor improvement on else-no-if diagnostic Don't suggest wrapping in block since it's highly likely to be a missing `if` after `else`. Also rework message a bit (open to further suggestions). cc: https://github.com/rust-lang/rust/pull/97298#discussion_r880933431 r? `@estebank`
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 9 | ||||
| -rw-r--r-- | src/test/ui/parser/else-no-if.stderr | 12 |
2 files changed, 3 insertions, 18 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index 37e34656941..bb6d892138a 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -2291,16 +2291,9 @@ impl<'a> Parser<'a> { .span_label(else_span, "expected an `if` or a block after this `else`") .span_suggestion( cond.span.shrink_to_lo(), - "add an `if` if this is the condition to an chained `if` statement after the `else`", + "add an `if` if this is the condition of a chained `else if` statement", "if ".to_string(), Applicability::MaybeIncorrect, - ).multipart_suggestion( - "... otherwise, place this expression inside of a block if it is not an `if` condition", - vec![ - (cond.span.shrink_to_lo(), "{ ".to_string()), - (cond.span.shrink_to_hi(), " }".to_string()), - ], - Applicability::MaybeIncorrect, ) .emit(); self.parse_if_after_cond(AttrVec::new(), cond.span.shrink_to_lo(), cond)? diff --git a/src/test/ui/parser/else-no-if.stderr b/src/test/ui/parser/else-no-if.stderr index 27abbadd7ad..b9c1a75276c 100644 --- a/src/test/ui/parser/else-no-if.stderr +++ b/src/test/ui/parser/else-no-if.stderr @@ -6,14 +6,10 @@ LL | } else false { | | | expected an `if` or a block after this `else` | -help: add an `if` if this is the condition to an chained `if` statement after the `else` +help: add an `if` if this is the condition of a chained `else if` statement | LL | } else if false { | ++ -help: ... otherwise, place this expression inside of a block if it is not an `if` condition - | -LL | } else { false } { - | + + error: expected `{`, found `falsy` --> $DIR/else-no-if.rs:10:12 @@ -23,14 +19,10 @@ LL | } else falsy() { | | | expected an `if` or a block after this `else` | -help: add an `if` if this is the condition to an chained `if` statement after the `else` +help: add an `if` if this is the condition of a chained `else if` statement | LL | } else if falsy() { | ++ -help: ... otherwise, place this expression inside of a block if it is not an `if` condition - | -LL | } else { falsy() } { - | + + error: expected `{`, found `falsy` --> $DIR/else-no-if.rs:17:12 |