@@ -492,11 +492,13 @@ impl<'a> CoverageSpansGenerator<'a> {
492
492
}
493
493
while let Some ( curr) = self . sorted_spans_iter . next ( ) {
494
494
debug ! ( "FOR curr={:?}" , curr) ;
495
- if self . some_prev . is_some ( ) && self . prev_starts_after_next ( & curr) {
495
+ if let Some ( prev) = & self . some_prev && prev. span . lo ( ) > curr. span . lo ( ) {
496
+ // Skip curr because prev has already advanced beyond the end of curr.
497
+ // This can only happen if a prior iteration updated `prev` to skip past
498
+ // a region of code, such as skipping past a closure.
496
499
debug ! (
497
500
" prev.span starts after curr.span, so curr will be dropped (skipping past \
498
- closure?); prev={:?}",
499
- self . prev( )
501
+ closure?); prev={prev:?}",
500
502
) ;
501
503
} else {
502
504
// Save a copy of the original span for `curr` in case the `CoverageSpan` is changed
@@ -510,13 +512,6 @@ impl<'a> CoverageSpansGenerator<'a> {
510
512
false
511
513
}
512
514
513
- /// Returns true if the curr span should be skipped because prev has already advanced beyond the
514
- /// end of curr. This can only happen if a prior iteration updated `prev` to skip past a region
515
- /// of code, such as skipping past a closure.
516
- fn prev_starts_after_next ( & self , next_curr : & CoverageSpan ) -> bool {
517
- self . prev ( ) . span . lo ( ) > next_curr. span . lo ( )
518
- }
519
-
520
515
/// If `prev`s span extends left of the closure (`curr`), carve out the closure's span from
521
516
/// `prev`'s span. (The closure's coverage counters will be injected when processing the
522
517
/// closure's own MIR.) Add the portion of the span to the left of the closure; and if the span
0 commit comments