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

Rollup of 6 pull requests #116820

Merged
merged 25 commits into from
Oct 17, 2023
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
46c545c
coverage: Rename `check_invoked_macro_name_span` to `maybe_push_macro…
Zalathar Oct 16, 2023
9b6ce4f
coverage: Rename `check_pending_dups` to `maybe_flush_pending_dups`
Zalathar Oct 16, 2023
d928d3e
coverage: Rename `hold_pending_dups_unless_dominated` to `update_pend…
Zalathar Oct 15, 2023
fa2e262
coverage: Use `DUMMY_SP` instead of creating a dummy span manually
Zalathar Oct 15, 2023
5f1e8f9
coverage: Simplify `push_refined_span`
Zalathar Oct 14, 2023
97d1a91
coverage: Flatten guard logic in `maybe_push_macro_name_span`
Zalathar Oct 16, 2023
7bbe4be
coverage: Flatten guard logic in `maybe_flush_pending_dups`
Zalathar Oct 16, 2023
9bb27f3
coverage: Remove redundant field `prev_expn_span`
Zalathar Oct 15, 2023
b1c44f4
coverage: Call `prev`/`curr` less in `to_refined_spans`
Zalathar Oct 15, 2023
41038db
coverage: Call `prev`/`curr` less in other places
Zalathar Oct 15, 2023
25e6303
coverage: Move `take_curr` and note what its callers are doing
Zalathar Oct 15, 2023
4ab4273
coverage: Inline `prev_starts_after_next`
Zalathar Oct 14, 2023
5e5a8e7
coverage: Inline `span_bcb_dominates`
Zalathar Oct 15, 2023
7aa1b83
coverage: Explain why we temporarily steal `pending_dups`
Zalathar Oct 14, 2023
17ec3cd
Fix outlives suggestion for GAT in RPITIT
compiler-errors Oct 16, 2023
414135d
Make `rustc_onunimplemented` export path agnostic
Noratrieb Oct 16, 2023
5e6da1e
add myself to smir triage
ouz-a Oct 16, 2023
ad26a0b
Improve display of parallel jobs in rustdoc-gui tester script
GuillaumeGomez Oct 16, 2023
587899e
Preserve unicode escapes in format string literals when pretty-printi…
narpfel Oct 16, 2023
581f88d
Rollup merge of #116754 - Zalathar:spans, r=oli-obk
GuillaumeGomez Oct 16, 2023
4c1c8ab
Rollup merge of #116798 - GuillaumeGomez:rustdoc-gui-tester-cleanup, …
GuillaumeGomez Oct 16, 2023
d0ade3f
Rollup merge of #116800 - compiler-errors:rpitit-gat-outlives, r=jack…
GuillaumeGomez Oct 16, 2023
347f7f3
Rollup merge of #116805 - Nilstrieb:onunimplemented-std-core-alloc-wh…
GuillaumeGomez Oct 16, 2023
23000c3
Rollup merge of #116808 - ouz-a:add_myself_to_triage, r=Nilstrieb
GuillaumeGomez Oct 16, 2023
05e2056
Rollup merge of #116811 - narpfel:unpretty-unicode-escape-in-format-s…
GuillaumeGomez Oct 16, 2023
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
Prev Previous commit
Next Next commit
coverage: Rename check_pending_dups to maybe_flush_pending_dups
This method's main responsibility is to flush the pending dups into refined
spans, if appropriate.
Zalathar committed Oct 16, 2023

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 9b6ce4fb3c86b9b1eadf6cef537d17138ec56d1e
4 changes: 2 additions & 2 deletions compiler/rustc_mir_transform/src/coverage/spans.rs
Original file line number Diff line number Diff line change
@@ -462,7 +462,7 @@ impl<'a> CoverageSpansGenerator<'a> {
/// `pending_dups` could have as few as one span)
/// In either case, no more spans will match the span of `pending_dups`, so
/// add the `pending_dups` if they don't overlap `curr`, and clear the list.
fn check_pending_dups(&mut self) {
fn maybe_flush_pending_dups(&mut self) {
if let Some(dup) = self.pending_dups.last()
&& dup.span != self.prev().span
{
@@ -502,7 +502,7 @@ impl<'a> CoverageSpansGenerator<'a> {
// by `self.curr_mut().merge_from(prev)`.
self.curr_original_span = curr.span;
self.some_curr.replace(curr);
self.check_pending_dups();
self.maybe_flush_pending_dups();
return true;
}
}