Skip to content

Commit 66210a2

Browse files
committed
coverage: Rename check_invoked_macro_name_span to maybe_push_macro_name_span
1 parent 9ac9cf3 commit 66210a2

File tree

1 file changed

+7
-5
lines changed
  • compiler/rustc_mir_transform/src/coverage

1 file changed

+7
-5
lines changed

compiler/rustc_mir_transform/src/coverage/spans.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ impl<'a> CoverageSpansGenerator<'a> {
287287
// span-processing steps don't make sense yet.
288288
if self.some_prev.is_none() {
289289
debug!(" initial span");
290-
self.check_invoked_macro_name_span();
290+
self.maybe_push_macro_name_span();
291291
continue;
292292
}
293293

@@ -299,15 +299,15 @@ impl<'a> CoverageSpansGenerator<'a> {
299299
debug!(" same bcb (and neither is a closure), merge with prev={prev:?}");
300300
let prev = self.take_prev();
301301
self.curr_mut().merge_from(prev);
302-
self.check_invoked_macro_name_span();
302+
self.maybe_push_macro_name_span();
303303
// Note that curr.span may now differ from curr_original_span
304304
} else if prev.span.hi() <= curr.span.lo() {
305305
debug!(
306306
" different bcbs and disjoint spans, so keep curr for next iter, and add prev={prev:?}",
307307
);
308308
let prev = self.take_prev();
309309
self.push_refined_span(prev);
310-
self.check_invoked_macro_name_span();
310+
self.maybe_push_macro_name_span();
311311
} else if prev.is_closure {
312312
// drop any equal or overlapping span (`curr`) and keep `prev` to test again in the
313313
// next iter
@@ -346,7 +346,7 @@ impl<'a> CoverageSpansGenerator<'a> {
346346
}
347347
} else {
348348
self.cutoff_prev_at_overlapping_curr();
349-
self.check_invoked_macro_name_span();
349+
self.maybe_push_macro_name_span();
350350
}
351351
}
352352

@@ -392,7 +392,9 @@ impl<'a> CoverageSpansGenerator<'a> {
392392
}
393393
}
394394

395-
fn check_invoked_macro_name_span(&mut self) {
395+
/// If `curr` is part of a new macro expansion, carve out and push a separate
396+
/// span that ends just after the macro name and its subsequent `!`.
397+
fn maybe_push_macro_name_span(&mut self) {
396398
let curr = self.curr();
397399

398400
let Some(visible_macro) = curr.visible_macro(self.body_span) else { return };

0 commit comments

Comments
 (0)