Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-12-03 18:09:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[manual_let_else]: only omit block if span is from same ctxt

Browse source
This commit is contained in:
y21 2023-09-28 16:31:21 +02:00
parent 493ab53f5b
commit 2d2017942a
4 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clippy_lints/src/manual_let_else.rs
View file

@ -136,9 +136,9 @@ fn emit_manual_let_else(
// for this to be machine applicable.
let mut app = Applicability::HasPlaceholders;
let (sn_expr, _) = snippet_with_context(cx, expr.span, span.ctxt(), "", &mut app);
let (sn_else, _) = snippet_with_context(cx, else_body.span, span.ctxt(), "", &mut app);
let (sn_else, else_is_mac_call) = snippet_with_context(cx, else_body.span, span.ctxt(), "", &mut app);
let else_bl = if matches!(else_body.kind, ExprKind::Block(..)) {
let else_bl = if matches!(else_body.kind, ExprKind::Block(..)) && !else_is_mac_call {
sn_else.into_owned()
} else {
format!("{{ {sn_else} }}")

4
tests/ui/manual_let_else_match.fixed
View file

@ -133,3 +133,7 @@ fn not_fire() {
[data @ .., 0, 0, 0, 0] | [data @ .., 0, 0] | [data @ ..] => data,
};
}
fn issue11579() {
let Some(msg) = Some("hi") else { unreachable!("can't happen") };
}

8
tests/ui/manual_let_else_match.rs
View file

@ -170,3 +170,11 @@ fn not_fire() {
[data @ .., 0, 0, 0, 0] | [data @ .., 0, 0] | [data @ ..] => data,
};
}
fn issue11579() {
let msg = match Some("hi") {
//~^ ERROR: this could be rewritten as `let...else`
Some(m) => m,
_ => unreachable!("can't happen"),
};
}

12
tests/ui/manual_let_else_match.stderr
View file

@ -92,5 +92,15 @@ LL | | _ => return,
LL | | };
| |______^ help: consider writing: `let ([data @ .., 0, 0, 0, 0] | [data @ .., 0, 0] | [data @ .., 0]) = data.as_slice() else { return };`
error: aborting due to 9 previous errors
error: this could be rewritten as `let...else`
--> $DIR/manual_let_else_match.rs:175:5
|
LL | / let msg = match Some("hi") {
LL | |
LL | | Some(m) => m,
LL | | _ => unreachable!("can't happen"),
LL | | };
| |______^ help: consider writing: `let Some(msg) = Some("hi") else { unreachable!("can't happen") };`
error: aborting due to 10 previous errors