From fb021d7ceff3f8b1d7cdb0c2bdd75ea07c0428d2 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Wed, 15 Mar 2023 17:46:36 -0400 Subject: refactor: remove usages of `map_or` / `map_or_else` (#18212) These methods are confusing because the arguments are backwards. I feel like they should have never been added to `Option` and that clippy should suggest rewriting to `map(...).unwrap_or(...)`/`map(...).unwrap_or_else(|| ...)` https://github.com/rust-lang/rfcs/issues/1025 --- cli/tools/coverage/merge.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cli/tools/coverage/merge.rs') diff --git a/cli/tools/coverage/merge.rs b/cli/tools/coverage/merge.rs index 29d26da3c..21ef29de9 100644 --- a/cli/tools/coverage/merge.rs +++ b/cli/tools/coverage/merge.rs @@ -356,7 +356,11 @@ fn merge_range_tree_children<'a>( let mut matching_trees: Vec<&'a mut RangeTree<'a>> = Vec::new(); for (_parent_index, children) in child_forests.iter_mut().enumerate() { let next_tree: Option<&'a mut RangeTree<'a>> = { - if children.peek().map_or(false, |tree| tree.start == *event) { + if children + .peek() + .map(|tree| tree.start == *event) + .unwrap_or(false) + { children.next() } else { None -- cgit v1.2.3