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