mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coverage: Rename check_invoked_macro_name_span to maybe_push_macro_name_span

Browse Source
This commit is contained in:
Zalathar 2023-10-16 20:52:20 +11:00
parent 9ace9da2e0
commit 46c545c1ba
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_mir_transform/src/coverage/spans.rs
View File

@ -290,12 +290,12 @@ fn to_refined_spans(mut self) -> Vec<CoverageSpan> {
while self.next_coverage_span() { while self.next_coverage_span() {
if self.some_prev.is_none() { if self.some_prev.is_none() {
debug!(" initial span"); debug!(" initial span");
self.check_invoked_macro_name_span(); self.maybe_push_macro_name_span();
} else if self.curr().is_mergeable(self.prev()) { } else if self.curr().is_mergeable(self.prev()) {
debug!(" same bcb (and neither is a closure), merge with prev={:?}", self.prev()); debug!(" same bcb (and neither is a closure), merge with prev={:?}", self.prev());
let prev = self.take_prev(); let prev = self.take_prev();
self.curr_mut().merge_from(prev); self.curr_mut().merge_from(prev);
self.check_invoked_macro_name_span(); self.maybe_push_macro_name_span();
// Note that curr.span may now differ from curr_original_span // Note that curr.span may now differ from curr_original_span
} else if self.prev_ends_before_curr() { } else if self.prev_ends_before_curr() {
debug!( debug!(
@ -305,7 +305,7 @@ fn to_refined_spans(mut self) -> Vec<CoverageSpan> {
); );
let prev = self.take_prev(); let prev = self.take_prev();
self.push_refined_span(prev); self.push_refined_span(prev);
self.check_invoked_macro_name_span(); self.maybe_push_macro_name_span();
} else if self.prev().is_closure { } else if self.prev().is_closure {
// drop any equal or overlapping span (`curr`) and keep `prev` to test again in the // drop any equal or overlapping span (`curr`) and keep `prev` to test again in the
// next iter // next iter
@ -347,7 +347,7 @@ fn to_refined_spans(mut self) -> Vec<CoverageSpan> {
} }
} else { } else {
self.cutoff_prev_at_overlapping_curr(); self.cutoff_prev_at_overlapping_curr();
self.check_invoked_macro_name_span(); self.maybe_push_macro_name_span();
} }
} }
@ -399,7 +399,9 @@ fn push_refined_span(&mut self, covspan: CoverageSpan) {
self.refined_spans.push(covspan) self.refined_spans.push(covspan)
} }
fn check_invoked_macro_name_span(&mut self) { /// If `curr` is part of a new macro expansion, carve out and push a separate
/// span that ends just after the macro name and its subsequent `!`.
fn maybe_push_macro_name_span(&mut self) {
if let Some(visible_macro) = self.curr().visible_macro(self.body_span) { if let Some(visible_macro) = self.curr().visible_macro(self.body_span) {
if !self if !self
.prev_expn_span .prev_expn_span