squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Improve lint message; add note for future autofixable updates

Browse source
This commit is contained in:
nahuakang 2021-02-04 10:51:40 +01:00
parent 78ef0f2f6c
commit 2f8a8d3468
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clippy_lints/src/loops.rs
View file

@ -2051,7 +2051,7 @@ fn check_manual_flatten<'tcx>(
);
diag.span_help(
inner_expr.span,
"also remove the `if let` statement in the for loop",
"...and remove the `if let` statement in the for loop",
);
}
);

4
tests/ui/manual_flatten.rs
View file

@ -25,7 +25,7 @@ fn main() {
}
// Test for loop over an implicit reference
// Note: If `clippy::manual_flatten` is made autofixable, this case will
// Note: if `clippy::manual_flatten` is made autofixable, this case will
// lead to a follow-up lint `clippy::into_iter_on_ref`
let z = &y;
for n in z {
@ -44,6 +44,8 @@ fn main() {
}
// Using the `None` variant should not trigger the lint
// Note: for an autofixable suggestion, the binding in the for loop has to take the
// name of the binding in the `if let`
let z = vec![Some(1), Some(2), Some(3)];
for n in z {
if n.is_none() {

10
tests/ui/manual_flatten.stderr
View file

@ -12,7 +12,7 @@ LL | | }
| |_____^
|
= note: `-D clippy::manual-flatten` implied by `-D warnings`
help: also remove the `if let` statement in the for loop
help: ...and remove the `if let` statement in the for loop
--> $DIR/manual_flatten.rs:7:9
|
LL | / if let Some(y) = n {
@ -33,7 +33,7 @@ LL | | };
LL | | }
| |_____^
|
help: also remove the `if let` statement in the for loop
help: ...and remove the `if let` statement in the for loop
--> $DIR/manual_flatten.rs:15:9
|
LL | / if let Ok(n) = n {
@ -54,7 +54,7 @@ LL | | }
LL | | }
| |_____^
|
help: also remove the `if let` statement in the for loop
help: ...and remove the `if let` statement in the for loop
--> $DIR/manual_flatten.rs:22:9
|
LL | / if let Ok(n) = n {
@ -75,7 +75,7 @@ LL | | }
LL | | }
| |_____^
|
help: also remove the `if let` statement in the for loop
help: ...and remove the `if let` statement in the for loop
--> $DIR/manual_flatten.rs:32:9
|
LL | / if let Ok(n) = n {
@ -96,7 +96,7 @@ LL | | }
LL | | }
| |_____^
|
help: also remove the `if let` statement in the for loop
help: ...and remove the `if let` statement in the for loop
--> $DIR/manual_flatten.rs:41:9
|
LL | / if let Some(m) = n {