Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coverage: Several small cleanups in spans #116754

Merged
merged 14 commits into from
Oct 17, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
coverage: Rename check_invoked_macro_name_span to `maybe_push_macro…
…_name_span`
  • Loading branch information
Zalathar committed Oct 16, 2023
commit 46c545c1ba7a859825b4760cbf6360f4d0a8e3de
12 changes: 7 additions & 5 deletions compiler/rustc_mir_transform/src/coverage/spans.rs
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,12 @@ impl<'a> CoverageSpansGenerator<'a> {
while self.next_coverage_span() {
if self.some_prev.is_none() {
debug!(" initial span");
self.check_invoked_macro_name_span();
self.maybe_push_macro_name_span();
} else if self.curr().is_mergeable(self.prev()) {
debug!(" same bcb (and neither is a closure), merge with prev={:?}", self.prev());
let prev = self.take_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
} else if self.prev_ends_before_curr() {
debug!(
Expand All @@ -305,7 +305,7 @@ impl<'a> CoverageSpansGenerator<'a> {
);
let prev = self.take_prev();
self.push_refined_span(prev);
self.check_invoked_macro_name_span();
self.maybe_push_macro_name_span();
} else if self.prev().is_closure {
// drop any equal or overlapping span (`curr`) and keep `prev` to test again in the
// next iter
Expand Down Expand Up @@ -347,7 +347,7 @@ impl<'a> CoverageSpansGenerator<'a> {
}
} else {
self.cutoff_prev_at_overlapping_curr();
self.check_invoked_macro_name_span();
self.maybe_push_macro_name_span();
}
}

Expand Down Expand Up @@ -399,7 +399,9 @@ impl<'a> CoverageSpansGenerator<'a> {
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 !self
.prev_expn_span
Expand Down