coverage: Simplify the injection of coverage statements

2023-09-22 17:36:01 +10:00
parent 249624b504
commit ff02d9200c
3 changed files with 86 additions and 142 deletions
--- a/compiler/rustc_mir_transform/src/coverage/spans.rs
+++ b/compiler/rustc_mir_transform/src/coverage/spans.rs
@@ -41,13 +41,8 @@ impl CoverageSpans {
        !self.bcb_to_spans[bcb].is_empty()
    }

-    pub(super) fn bcbs_with_coverage_spans(
-        &self,
-    ) -> impl Iterator<Item = (BasicCoverageBlock, &[Span])> {
-        self.bcb_to_spans.iter_enumerated().filter_map(|(bcb, spans)| {
-            // Only yield BCBs that have at least one coverage span.
-            (!spans.is_empty()).then_some((bcb, spans.as_slice()))
-        })
+    pub(super) fn spans_for_bcb(&self, bcb: BasicCoverageBlock) -> &[Span] {
+        &self.bcb_to_spans[bcb]
    }
 }