Rollup of 6 pull requests #116820

GuillaumeGomez · 2023-10-16T21:58:07Z

Successful merges:

coverage: Several small cleanups in spans #116754 (coverage: Several small cleanups in spans)
Improve display of parallel jobs in rustdoc-gui tester script #116798 (Improve display of parallel jobs in rustdoc-gui tester script)
Fix implied outlives check for GAT in RPITIT #116800 (Fix implied outlives check for GAT in RPITIT)
Make rustc_onunimplemented export path agnostic #116805 (Make rustc_onunimplemented export path agnostic)
Add myself to smir triage #116808 (Add myself to smir triage)
Preserve unicode escapes in format string literals when pretty-printing AST #116811 (Preserve unicode escapes in format string literals when pretty-printing AST)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…_name_span`

This method's main responsibility is to flush the pending dups into refined spans, if appropriate.

…ing_dups`

This patch also sorts the constructor fields into declaration order.

It turns out that all of the `len` manipulation here was just reimplementing `last_mut`.

This span can always be retrieved from `prev`, so there is no need to store it separately.

This makes it easier to see that the non-initial cases assume that `prev` and `curr` are set, and all operate on the same prev/curr references.

This reduces clutter, and makes it easier to notice regions where mutations definitely don't occur.

Interacting with `basic_coverage_blocks` directly makes it easier to satisfy the borrow checker when mutating `pending_dups` while reading other fields.

This makes it so that all the matchers that match against paths use the definition path instead of the export path. This removes all duplication around `std`/`alloc`/`core`. This is not necessarily optimal because we now depend on internal implementation details like `core::ops::control_flow::ControlFlow`, which is not very nice and probably not acceptable for a stable `on_unimplemented`. An alternative would be to just string-replace normalize away `alloc`/`core` to `std` as a special case, keeping the export paths but making it so that we're still fully standard library flavor agnostic.

…ng AST

coverage: Several small cleanups in `spans` While investigating the details of coverage span processing, I noticed several opportunities to make the code simpler and clearer. --- `@rustbot` label +A-code-coverage

…cleanup, r=notriddle Improve display of parallel jobs in rustdoc-gui tester script If no `-j` option is not passed to `x.py`, it would display `-1`, which isn't great. r? `@notriddle`

…s, r=jackh726 Fix implied outlives check for GAT in RPITIT We enforce certain `Self: 'lt` bounds for GATs to save space for more sophisticated implied bounds, but those currently operate on the HIR. Code was easily reworked to operate on def-ids so that we can properly let these suggestions propagate through synthetic associated types like RPITITs and AFITs. r? `@jackh726` or `@aliemjay` Fixes rust-lang#116789

…-alloc-whatever-who-cares, r=compiler-errors Make `rustc_onunimplemented` export path agnostic This makes it so that all the matchers that match against paths use the definition path instead of the export path. This removes all duplication around `std`/`alloc`/`core`. This is not necessarily optimal because we now depend on internal implementation details like `core::ops::control_flow::ControlFlow`, which is not very nice and probably not acceptable for a stable `on_unimplemented`. An alternative would be to just string-replace normalize away `alloc`/`core` to `std` as a special case, keeping the export paths but making it so that we're still fully standard library flavor agnostic. Looking at the diff, I'm starting to think that some simple string replacement would go a long way towards fixing the problem of duplication while keeping export paths... What do you prefer? Also `@weiznich` for your thoughts about the stable version. r? compiler-errors

…trieb Add myself to smir triage I would like get pinged when someone makes changes to smir

…-format-string-literal, r=Nilstrieb Preserve unicode escapes in format string literals when pretty-printing AST Fixes rust-lang#116799 Thanks to `@Nilstrieb` for the pointer to the correct location, that was really helpful for someone unfamiliar with the codebase.

GuillaumeGomez · 2023-10-16T21:58:19Z

@bors r+ p=6 rollup=never

bors · 2023-10-16T21:58:21Z

📌 Commit 05e2056 has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2023-10-16T23:01:23Z

⌛ Testing commit 05e2056 with merge 6433879...

bors · 2023-10-17T00:52:45Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 6433879 to master...

rust-timer · 2023-10-17T00:54:28Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116754	coverage: Several small cleanups in `spans`	`f99a67e9f3007fa0e628bcace98a7d1573c1d9fa` (link)
#116798	Improve display of parallel jobs in rustdoc-gui tester scri…	`06eddda0d2821d32eed47531499b95482b449c00` (link)
#116800	Fix implied outlives check for GAT in RPITIT	`bbe1a31e8ccd2d6a359a5bf41d8cb5f3f0d31612` (link)
#116805	Make `rustc_onunimplemented` export path agnostic	`9360e9ada87876f4ce58107791b799019357da91` (link)
#116808	Add myself to smir triage	`e9351b96ee82081f53520cd1486973226ddee297` (link)
#116811	Preserve unicode escapes in format string literals when pre…	`321817ab73fda62b55f73372d61478bee80d71e2` (link)

previous master: 49691b1f70

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-10-17T03:12:21Z

Finished benchmarking commit (6433879): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	1.2%	[0.4%, 1.8%]	3
Improvements ✅ (primary)	-1.6%	[-1.6%, -1.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.6%	[-1.6%, -1.6%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 627.292s -> 625.44s (-0.30%)
Artifact size: 305.57 MiB -> 305.55 MiB (-0.01%)

Zalathar and others added 25 commits October 16, 2023 20:52

coverage: Rename check_invoked_macro_name_span to `maybe_push_macro…

46c545c

…_name_span`

coverage: Rename check_pending_dups to maybe_flush_pending_dups

9b6ce4f

This method's main responsibility is to flush the pending dups into refined spans, if appropriate.

coverage: Rename hold_pending_dups_unless_dominated to `update_pend…

d928d3e

…ing_dups`

coverage: Use DUMMY_SP instead of creating a dummy span manually

fa2e262

This patch also sorts the constructor fields into declaration order.

coverage: Simplify push_refined_span

5f1e8f9

It turns out that all of the `len` manipulation here was just reimplementing `last_mut`.

coverage: Flatten guard logic in maybe_push_macro_name_span

97d1a91

coverage: Flatten guard logic in maybe_flush_pending_dups

7bbe4be

coverage: Remove redundant field prev_expn_span

9bb27f3

This span can always be retrieved from `prev`, so there is no need to store it separately.

coverage: Call prev/curr less in to_refined_spans

b1c44f4

This makes it easier to see that the non-initial cases assume that `prev` and `curr` are set, and all operate on the same prev/curr references.

coverage: Call prev/curr less in other places

41038db

This reduces clutter, and makes it easier to notice regions where mutations definitely don't occur.

coverage: Move take_curr and note what its callers are doing

25e6303

coverage: Inline prev_starts_after_next

4ab4273

coverage: Inline span_bcb_dominates

5e5a8e7

Interacting with `basic_coverage_blocks` directly makes it easier to satisfy the borrow checker when mutating `pending_dups` while reading other fields.

coverage: Explain why we temporarily steal pending_dups

7aa1b83

Fix outlives suggestion for GAT in RPITIT

17ec3cd

add myself to smir triage

5e6da1e

Improve display of parallel jobs in rustdoc-gui tester script

ad26a0b

Preserve unicode escapes in format string literals when pretty-printi…

587899e

…ng AST

Rollup merge of rust-lang#116754 - Zalathar:spans, r=oli-obk

581f88d

coverage: Several small cleanups in `spans` While investigating the details of coverage span processing, I noticed several opportunities to make the code simpler and clearer. --- `@rustbot` label +A-code-coverage

Rollup merge of rust-lang#116798 - GuillaumeGomez:rustdoc-gui-tester-…

4c1c8ab

…cleanup, r=notriddle Improve display of parallel jobs in rustdoc-gui tester script If no `-j` option is not passed to `x.py`, it would display `-1`, which isn't great. r? `@notriddle`

Rollup merge of rust-lang#116808 - ouz-a:add_myself_to_triage, r=Nils…

23000c3

…trieb Add myself to smir triage I would like get pinged when someone makes changes to smir

rustbot added the rollup A PR which is a rollup label Oct 16, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 16, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 17, 2023

bors merged commit 6433879 into rust-lang:master Oct 17, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 17, 2023

bors mentioned this pull request Oct 17, 2023

Implement an internal lint encouraging use of Span::eq_ctxt #116787

Merged

GuillaumeGomez deleted the rollup-l54ri5q branch October 17, 2023 08:48

Veykril mentioned this pull request Oct 17, 2023

Pull upstream master 2023 10 17 ferrocene/ferrocene#54

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #116820

Rollup of 6 pull requests #116820

GuillaumeGomez commented Oct 16, 2023

GuillaumeGomez commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 17, 2023

rust-timer commented Oct 17, 2023

rust-timer commented Oct 17, 2023

Rollup of 6 pull requests #116820

Rollup of 6 pull requests #116820

Conversation

GuillaumeGomez commented Oct 16, 2023

GuillaumeGomez commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 17, 2023

rust-timer commented Oct 17, 2023

rust-timer commented Oct 17, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size