diff options
Diffstat (limited to 'cli/tools/coverage')
-rw-r--r-- | cli/tools/coverage/merge.rs | 6 | ||||
-rw-r--r-- | cli/tools/coverage/mod.rs | 5 |
2 files changed, 9 insertions, 2 deletions
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 diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs index 05ad853f8..eaa087171 100644 --- a/cli/tools/coverage/mod.rs +++ b/cli/tools/coverage/mod.rs @@ -562,7 +562,10 @@ fn collect_coverages( ) -> Result<Vec<ScriptCoverage>, AnyError> { let mut coverages: Vec<ScriptCoverage> = Vec::new(); let file_paths = FileCollector::new(|file_path| { - file_path.extension().map_or(false, |ext| ext == "json") + file_path + .extension() + .map(|ext| ext == "json") + .unwrap_or(false) }) .ignore_git_folder() .ignore_node_modules() |