@@ -215,9 +215,6 @@ struct CoverageSpansGenerator<'a> {
215215 /// is mutated.
216216 prev_original_span : Span ,
217217
218- /// A copy of the expn_span from the prior iteration.
219- prev_expn_span : Option < Span > ,
220-
221218 /// One or more `CoverageSpan`s with the same `Span` but different `BasicCoverageBlock`s, and
222219 /// no `BasicCoverageBlock` in this list dominates another `BasicCoverageBlock` in the list.
223220 /// If a new `curr` span also fits this criteria (compared to an existing list of
@@ -276,7 +273,6 @@ impl<'a> CoverageSpansGenerator<'a> {
276273 curr_original_span : DUMMY_SP ,
277274 some_prev : None ,
278275 prev_original_span : DUMMY_SP ,
279- prev_expn_span : None ,
280276 pending_dups : Vec :: new ( ) ,
281277 refined_spans : Vec :: with_capacity ( basic_coverage_blocks. num_nodes ( ) * 2 ) ,
282278 } ;
@@ -395,8 +391,8 @@ impl<'a> CoverageSpansGenerator<'a> {
395391
396392 fn check_invoked_macro_name_span ( & mut self ) {
397393 let Some ( visible_macro) = self . curr ( ) . visible_macro ( self . body_span ) else { return } ;
398- if let Some ( prev_expn_span ) = & self . prev_expn_span
399- && prev_expn_span . ctxt ( ) == self . curr ( ) . expn_span . ctxt ( )
394+ if let Some ( prev ) = & self . some_prev
395+ && prev . expn_span . ctxt ( ) == self . curr ( ) . expn_span . ctxt ( )
400396 {
401397 return ;
402398 }
@@ -475,7 +471,6 @@ impl<'a> CoverageSpansGenerator<'a> {
475471 /// Advance `prev` to `curr` (if any), and `curr` to the next `CoverageSpan` in sorted order.
476472 fn next_coverage_span ( & mut self ) -> bool {
477473 if let Some ( curr) = self . some_curr . take ( ) {
478- self . prev_expn_span = Some ( curr. expn_span ) ;
479474 self . some_prev = Some ( curr) ;
480475 self . prev_original_span = self . curr_original_span ;
481476 }
0 commit comments