[manual_flatten]: Fix with nested Some or Ok pattern (#14846)

Alexendoo · web-flow · commit 3927a61a546b · 2025-05-26T21:03:39.000Z
changelog: [`manual_flatten`]: fix with nested `Some` or `Ok` pattern fixes rust-lang/rust-clippy#6776
diff --git a/clippy_lints/src/loops/manual_flatten.rs b/clippy_lints/src/loops/manual_flatten.rs
@@ -3,7 +3,7 @@ use super::utils::make_iterator_snippet;
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::msrvs::{self, Msrv};
 use clippy_utils::visitors::is_local_used;
-use clippy_utils::{higher, path_to_local_id, peel_blocks_with_stmt};
+use clippy_utils::{higher, is_refutable, path_to_local_id, peel_blocks_with_stmt};
 use rustc_errors::Applicability;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::{Expr, Pat, PatKind};
@@ -28,7 +28,7 @@ pub(super) fn check<'tcx>(
         && let PatKind::Binding(_, pat_hir_id, _, _) = pat.kind
         && path_to_local_id(let_expr, pat_hir_id)
         // Ensure the `if let` statement is for the `Some` variant of `Option` or the `Ok` variant of `Result`
-        && let PatKind::TupleStruct(ref qpath, _, _) = let_pat.kind
+        && let PatKind::TupleStruct(ref qpath, [inner_pat], _) = let_pat.kind
         && let Res::Def(DefKind::Ctor(..), ctor_id) = cx.qpath_res(qpath, let_pat.hir_id)
         && let Some(variant_id) = cx.tcx.opt_parent(ctor_id)
         && let some_ctor = cx.tcx.lang_items().option_some_variant() == Some(variant_id)
@@ -37,6 +37,7 @@ pub(super) fn check<'tcx>(
         // Ensure expr in `if let` is not used afterwards
         && !is_local_used(cx, if_then, pat_hir_id)
         && msrv.meets(cx, msrvs::ITER_FLATTEN)
+        && !is_refutable(cx, inner_pat)
     {
         let if_let_type = if some_ctor { "Some" } else { "Ok" };
         // Prepare the error message
diff --git a/tests/ui/manual_flatten.rs b/tests/ui/manual_flatten.rs
@@ -123,6 +123,13 @@ fn main() {
         println!("{}", n);
     }
 
+    // Using nested `Some` pattern should not trigger the lint
+    for n in vec![Some((1, Some(2)))] {
+        if let Some((_, Some(n))) = n {
+            println!("{}", n);
+        }
+    }
+
     run_unformatted_tests();
 }
 
diff --git a/tests/ui/manual_flatten.stderr b/tests/ui/manual_flatten.stderr
@@ -178,7 +178,7 @@ LL | |         }
    | |_________^
 
 error: unnecessary `if let` since only the `Some` variant of the iterator element is used
-  --> tests/ui/manual_flatten.rs:132:5
+  --> tests/ui/manual_flatten.rs:139:5
    |
 LL | /     for n in vec![
 LL | |
@@ -189,7 +189,7 @@ LL | |     }
    | |_____^
    |
 help: remove the `if let` statement in the for loop and then...
-  --> tests/ui/manual_flatten.rs:139:9
+  --> tests/ui/manual_flatten.rs:146:9
    |
 LL | /         if let Some(n) = n {
 LL | |             println!("{:?}", n);

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,13 @@ fn main() {`
`123`	`123`	`println!("{}", n);`
`124`	`124`	`}`
`125`	`125`
	`126`	+ // Using nested `Some` pattern should not trigger the lint
	`127`	`+ for n in vec![Some((1, Some(2)))] {`
	`128`	`+ if let Some((_, Some(n))) = n {`
	`129`	`+ println!("{}", n);`
	`130`	`+ }`
	`131`	`+ }`
	`132`	`+`
`126`	`133`	`run_unformatted_tests();`
`127`	`134`	`}`
`128`	`135`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ LL \| \| }`
`178`	`178`	`\| \|_________^`
`179`	`179`
`180`	`180`	error: unnecessary `if let` since only the `Some` variant of the iterator element is used
`181`		`- --> tests/ui/manual_flatten.rs:132:5`
	`181`	`+ --> tests/ui/manual_flatten.rs:139:5`
`182`	`182`	`\|`
`183`	`183`	`LL \| / for n in vec![`
`184`	`184`	`LL \| \|`
`@@ -189,7 +189,7 @@ LL \| \| }`
`189`	`189`	`\| \|_____^`
`190`	`190`	`\|`
`191`	`191`	help: remove the `if let` statement in the for loop and then...
`192`		`- --> tests/ui/manual_flatten.rs:139:9`
	`192`	`+ --> tests/ui/manual_flatten.rs:146:9`
`193`	`193`	`\|`
`194`	`194`	`LL \| / if let Some(n) = n {`
`195`	`195`	`LL \| \| println!("{:?}", n);`