@@ -214,9 +214,6 @@ struct CoverageSpansGenerator<'a> {
214
214
/// is mutated.
215
215
prev_original_span : Span ,
216
216
217
- /// A copy of the expn_span from the prior iteration.
218
- prev_expn_span : Option < Span > ,
219
-
220
217
/// One or more `CoverageSpan`s with the same `Span` but different `BasicCoverageBlock`s, and
221
218
/// no `BasicCoverageBlock` in this list dominates another `BasicCoverageBlock` in the list.
222
219
/// If a new `curr` span also fits this criteria (compared to an existing list of
@@ -275,7 +272,6 @@ impl<'a> CoverageSpansGenerator<'a> {
275
272
curr_original_span : DUMMY_SP ,
276
273
some_prev : None ,
277
274
prev_original_span : DUMMY_SP ,
278
- prev_expn_span : None ,
279
275
pending_dups : Vec :: new ( ) ,
280
276
refined_spans : Vec :: with_capacity ( basic_coverage_blocks. num_nodes ( ) * 2 ) ,
281
277
} ;
@@ -394,8 +390,8 @@ impl<'a> CoverageSpansGenerator<'a> {
394
390
395
391
fn check_invoked_macro_name_span ( & mut self ) {
396
392
let Some ( visible_macro) = self . curr ( ) . visible_macro ( self . body_span ) else { return } ;
397
- if let Some ( prev_expn_span ) = & self . prev_expn_span
398
- && prev_expn_span . ctxt ( ) == self . curr ( ) . expn_span . ctxt ( )
393
+ if let Some ( prev ) = & self . some_prev
394
+ && prev . expn_span . ctxt ( ) == self . curr ( ) . expn_span . ctxt ( )
399
395
{
400
396
return ;
401
397
}
@@ -472,7 +468,6 @@ impl<'a> CoverageSpansGenerator<'a> {
472
468
/// Advance `prev` to `curr` (if any), and `curr` to the next `CoverageSpan` in sorted order.
473
469
fn next_coverage_span ( & mut self ) -> bool {
474
470
if let Some ( curr) = self . some_curr . take ( ) {
475
- self . prev_expn_span = Some ( curr. expn_span ) ;
476
471
self . some_prev = Some ( curr) ;
477
472
self . prev_original_span = self . curr_original_span ;
478
473
}
0 commit comments