diff options
Diffstat (limited to 'cli/tools/coverage')
| -rw-r--r-- | cli/tools/coverage/merge.rs | 3 | ||||
| -rw-r--r-- | cli/tools/coverage/range_tree.rs | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/cli/tools/coverage/merge.rs b/cli/tools/coverage/merge.rs index 08a695e1d..63b795f76 100644 --- a/cli/tools/coverage/merge.rs +++ b/cli/tools/coverage/merge.rs @@ -126,8 +126,7 @@ pub fn merge_functions( trees.push(tree); } } - let merged = - RangeTree::normalize(&rta, merge_range_trees(&rta, trees).unwrap()); + let merged = RangeTree::normalize(merge_range_trees(&rta, trees).unwrap()); let ranges = merged.to_ranges(); let is_block_coverage: bool = !(ranges.len() == 1 && ranges[0].count == 0); diff --git a/cli/tools/coverage/range_tree.rs b/cli/tools/coverage/range_tree.rs index aca8939ee..87ddd8baa 100644 --- a/cli/tools/coverage/range_tree.rs +++ b/cli/tools/coverage/range_tree.rs @@ -71,10 +71,7 @@ impl<'rt> RangeTree<'rt> { (rta.alloc(left), rta.alloc(right)) } - pub fn normalize<'a>( - rta: &'a RangeTreeArena<'a>, - tree: &'a mut RangeTree<'a>, - ) -> &'a mut RangeTree<'a> { + pub fn normalize<'a>(tree: &'a mut RangeTree<'a>) -> &'a mut RangeTree<'a> { tree.children = { let mut children: Vec<&'a mut RangeTree<'a>> = Vec::new(); let mut chain: Vec<&'a mut RangeTree<'a>> = Vec::new(); @@ -96,7 +93,7 @@ impl<'rt> RangeTree<'rt> { head.children.push(sub_child); } } - children.push(RangeTree::normalize(rta, head)); + children.push(RangeTree::normalize(head)); } chain.push(child) } @@ -110,7 +107,7 @@ impl<'rt> RangeTree<'rt> { head.children.push(sub_child); } } - children.push(RangeTree::normalize(rta, head)); + children.push(RangeTree::normalize(head)); } if children.len() == 1 |