diff options
| author | Kartavya Vashishtha <sendtokartavya@gmail.com> | 2022-11-16 13:15:22 +0530 |
|---|---|---|
| committer | Kartavya Vashishtha <sendtokartavya@gmail.com> | 2022-11-16 13:15:22 +0530 |
| commit | bc3cd344a1edefdea8eef7962d75bb35cdeea880 (patch) | |
| tree | 83f5e3072a8c07bfcf10b79f55498bbfd2cd0d7b | |
| parent | 036a0108ac51a25ad4c51abd8182cc512b35e88a (diff) | |
| download | rust-bc3cd344a1edefdea8eef7962d75bb35cdeea880.tar.gz rust-bc3cd344a1edefdea8eef7962d75bb35cdeea880.zip | |
fix clippy suggestions
| -rw-r--r-- | clippy_lints/src/loops/never_loop.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clippy_lints/src/loops/never_loop.rs b/clippy_lints/src/loops/never_loop.rs index 123e1e3cce1..14f161f5102 100644 --- a/clippy_lints/src/loops/never_loop.rs +++ b/clippy_lints/src/loops/never_loop.rs @@ -118,6 +118,7 @@ fn stmt_to_expr<'tcx>(stmt: &Stmt<'tcx>) -> Option<(&'tcx Expr<'tcx>, Option<&'t } } +#[allow(clippy::too_many_lines)] fn never_loop_expr(expr: &Expr<'_>, ignore_ids: &mut Vec<HirId>, main_loop_id: HirId) -> NeverLoopResult { match expr.kind { ExprKind::Box(e) @@ -170,7 +171,7 @@ fn never_loop_expr(expr: &Expr<'_>, ignore_ids: &mut Vec<HirId>, main_loop_id: H } }, ExprKind::Block(b, l) => { - if let Some(_) = l { + if l.is_some() { ignore_ids.push(b.hir_id); } let ret = never_loop_block(b, ignore_ids, main_loop_id); @@ -187,6 +188,7 @@ fn never_loop_expr(expr: &Expr<'_>, ignore_ids: &mut Vec<HirId>, main_loop_id: H NeverLoopResult::AlwaysBreak } }, + // checks if break targets a block instead of a loop ExprKind::Break(Destination { target_id: Ok(t), .. }, e) if ignore_ids.contains(&t) => e .map_or(NeverLoopResult::Otherwise, |e| { combine_seq(never_loop_expr(e, ignore_ids, main_loop_id), NeverLoopResult::Otherwise) |
