dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #107487 - edward-shen:edward-shen/107213-round-2, r=estebank 

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

Changes the hint to a suggestion, suggested in #107213.

r? ```@estebank```
This commit is contained in:
Matthias Krüger 2023-02-01 05:54:39 +01:00 committed by GitHub
parent b853b22270 e905b93706
commit 6390d25eab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_parse/src/errors.rs
View File

@ -351,7 +351,7 @@ pub(crate) enum IfExpressionMissingThenBlockSub {
}
#[derive(Subdiagnostic)]
#[help(parse_extra_if_in_let_else)]
#[suggestion(parse_extra_if_in_let_else, applicability = "maybe-incorrect", code = "")]
pub(crate) struct IfExpressionLetSomeSub {
#[primary_span]
pub if_span: Span,

2
compiler/rustc_parse/src/parser/expr.rs
View File

@ -2290,7 +2290,7 @@ impl<'a> Parser<'a> {
block
} else {
let let_else_sub = matches!(cond.kind, ExprKind::Let(..))
.then(|| IfExpressionLetSomeSub { if_span: lo });
.then(|| IfExpressionLetSomeSub { if_span: lo.until(cond_span) });
self.sess.emit_err(IfExpressionMissingThenBlock {
if_span: lo,

6
tests/ui/let-else/accidental-if.stderr
View File

@ -10,10 +10,10 @@ help: add a block here
LL | if let Some(y) = x else {
| ^
help: remove the `if` if you meant to write a `let...else` statement
--> $DIR/accidental-if.rs:3:5
|
LL | if let Some(y) = x else {
| ^^
LL - if let Some(y) = x else {
LL + let Some(y) = x else {
|
error: aborting due to previous error

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

@ -38,10 +38,10 @@ help: add a block here
LL | if let Some(n) = opt else {
| ^
help: remove the `if` if you meant to write a `let...else` statement
--> $DIR/ensure-that-let-else-does-not-interact-with-let-chains.rs:24:5
|
LL | if let Some(n) = opt else {
| ^^
LL - if let Some(n) = opt else {
LL + let Some(n) = opt else {
|
error: this `if` expression is missing a block after the condition
--> $DIR/ensure-that-let-else-does-not-interact-with-let-chains.rs:28:5