Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 23:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace combine_both by combine_seq

Browse source 
All evaluations now happen in order.
This commit is contained in:
Samuel Tardieu 2023-02-13 20:36:41 +01:00
parent c231b41887
commit 1fec2927c5
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clippy_lints/src/loops/never_loop.rs
View file

@ -68,18 +68,6 @@ fn combine_seq(first: NeverLoopResult, second: NeverLoopResult) -> NeverLoopResu
} }
} }
// Combine two results where both parts are called but not necessarily in order.
#[must_use]
fn combine_both(left: NeverLoopResult, right: NeverLoopResult) -> NeverLoopResult {
match (left, right) {
(NeverLoopResult::MayContinueMainLoop, _) | (_, NeverLoopResult::MayContinueMainLoop) => {
NeverLoopResult::MayContinueMainLoop
},
(NeverLoopResult::AlwaysBreak, _) | (_, NeverLoopResult::AlwaysBreak) => NeverLoopResult::AlwaysBreak,
(NeverLoopResult::Otherwise, NeverLoopResult::Otherwise) => NeverLoopResult::Otherwise,
}
}
// Combine two results where only one of the part may have been executed. // Combine two results where only one of the part may have been executed.
#[must_use] #[must_use]
fn combine_branches(b1: NeverLoopResult, b2: NeverLoopResult) -> NeverLoopResult { fn combine_branches(b1: NeverLoopResult, b2: NeverLoopResult) -> NeverLoopResult {
@ -139,7 +127,7 @@ fn never_loop_expr(expr: &Expr<'_>, ignore_ids: &mut Vec<HirId>, main_loop_id: H
ExprKind::Struct(_, fields, base) => { ExprKind::Struct(_, fields, base) => {
let fields = never_loop_expr_all(&mut fields.iter().map(|f| f.expr), ignore_ids, main_loop_id); let fields = never_loop_expr_all(&mut fields.iter().map(|f| f.expr), ignore_ids, main_loop_id);
if let Some(base) = base { if let Some(base) = base {
combine_both(fields, never_loop_expr(base, ignore_ids, main_loop_id)) combine_seq(fields, never_loop_expr(base, ignore_ids, main_loop_id))
} else { } else {
fields fields
} }
@ -218,7 +206,7 @@ fn never_loop_expr(expr: &Expr<'_>, ignore_ids: &mut Vec<HirId>, main_loop_id: H
| InlineAsmOperand::SymFn { .. } | InlineAsmOperand::SymFn { .. }
| InlineAsmOperand::SymStatic { .. } => NeverLoopResult::Otherwise, | InlineAsmOperand::SymStatic { .. } => NeverLoopResult::Otherwise,
}) })
.fold(NeverLoopResult::Otherwise, combine_both), .fold(NeverLoopResult::Otherwise, combine_seq),
ExprKind::Yield(_, _) ExprKind::Yield(_, _)
| ExprKind::Closure { .. } | ExprKind::Closure { .. }
| ExprKind::Path(_) | ExprKind::Path(_)
@ -234,7 +222,7 @@ fn never_loop_expr_all<'a, T: Iterator<Item = &'a Expr<'a>>>(
main_loop_id: HirId, main_loop_id: HirId,
) -> NeverLoopResult { ) -> NeverLoopResult {
es.map(|e| never_loop_expr(e, ignore_ids, main_loop_id)) es.map(|e| never_loop_expr(e, ignore_ids, main_loop_id))
.fold(NeverLoopResult::Otherwise, combine_both) .fold(NeverLoopResult::Otherwise, combine_seq)
} }
fn never_loop_expr_branch<'a, T: Iterator<Item = &'a Expr<'a>>>( fn never_loop_expr_branch<'a, T: Iterator<Item = &'a Expr<'a>>>(