Skip to content

Commit a09bc1b

Browse files
committed
Check if let expr usage in manual_flatten
`manual_flatten` should not trigger when match expression in `if let` is going to be used.
1 parent 711c5cb commit a09bc1b

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

clippy_lints/src/loops/manual_flatten.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use super::utils::make_iterator_snippet;
22
use super::MANUAL_FLATTEN;
33
use clippy_utils::diagnostics::span_lint_and_then;
4+
use clippy_utils::visitors::LocalUsedVisitor;
45
use clippy_utils::{is_lang_ctor, path_to_local_id};
56
use if_chain::if_chain;
67
use rustc_errors::Applicability;
@@ -37,16 +38,18 @@ pub(super) fn check<'tcx>(
3738
if_chain! {
3839
if let Some(inner_expr) = inner_expr;
3940
if let ExprKind::Match(
40-
match_expr, match_arms, MatchSource::IfLetDesugar{ contains_else_clause: false }
41+
match_expr, [true_arm, _else_arm], MatchSource::IfLetDesugar{ contains_else_clause: false }
4142
) = inner_expr.kind;
4243
// Ensure match_expr in `if let` statement is the same as the pat from the for-loop
4344
if let PatKind::Binding(_, pat_hir_id, _, _) = pat.kind;
4445
if path_to_local_id(match_expr, pat_hir_id);
4546
// Ensure the `if let` statement is for the `Some` variant of `Option` or the `Ok` variant of `Result`
46-
if let PatKind::TupleStruct(ref qpath, _, _) = match_arms[0].pat.kind;
47+
if let PatKind::TupleStruct(ref qpath, _, _) = true_arm.pat.kind;
4748
let some_ctor = is_lang_ctor(cx, qpath, OptionSome);
4849
let ok_ctor = is_lang_ctor(cx, qpath, ResultOk);
4950
if some_ctor || ok_ctor;
51+
// Ensure epxr in `if let` is not used afterwards
52+
if !LocalUsedVisitor::new(cx, pat_hir_id).check_arm(true_arm);
5053
then {
5154
let if_let_type = if some_ctor { "Some" } else { "Ok" };
5255
// Prepare the error message

0 commit comments

Comments
 (0)