Rollup of 4 pull requests #140366

matthiaskrgr · 2025-04-27T14:09:01Z

Successful merges:

Fix never pattern printing #140246 (Fix never pattern printing)
Improve if/else pretty printing #140280 (Improve if/else pretty printing)
Update lint-docs to default to Rust 2024 #140348 (Update lint-docs to default to Rust 2024)
Use search_for_cycle_permutation to look for variances_of #140358 (Use search_for_cycle_permutation to look for variances_of)

r? @ghost
@rustbot modify labels: rollup

This currently prints badly, with unclosed indentation.

The AST pretty printing is a bit wonky. The HIR pretty printing is extremely wonky.

Indents for `cbox` and `ibox` are 0 or `INDENT_UNIT` (4) except for a couple of places which are `INDENT_UNIT - 1` for no clear reason. This commit changes the three space indents to four spaces.

By removing some of the over-indenting. AST pretty printing now looks correct. HIR pretty printing is better, but still over-indents some.

In the AST the "then" block is represented as a `Block`. In HIR the "then" block is represented as an `Expr` that happens to always be. `ExprKind::Block`. By deconstructing the `ExprKind::Block` to extract the block within, things print properly. For `issue-82392.rs`, note that we no longer print a type after the "then" block. This is good, it now matches how we don't print a type for the "else" block. (Well, we do print a type after the "else" block, but it's for the whole if/else.) Also tighten up some of the pattern matching -- these block expressions within if/else will never have labels.

This removes the hard-coded list of edition support in the lint-docs tool, and instead just assumes the edition attribute is something valid. There isn't a real reason to have this, as rustc will error if given a wrong number. This should be easier to maintain going forward.

This updates the lint-docs tool to default to the 2024 edition. The lint docs are supposed to illustrate the code with the latest edition, and I just forgot to update this in rust-lang#133349. Some docs needed to add the `edition` attribute since they were assuming a particular edition, but were missing the explicit annotation.

…ting, r=Nadrieril Fix never pattern printing It's currently broken, but there's an easy fix. r? `@Nadrieril`

…ng, r=Urgau Improve if/else pretty printing AST/HIR pretty printing of if/else is currently pretty bad. This PR improves it a lot. r? `@Nadrieril`

…r-errors Update lint-docs to default to Rust 2024 This updates the lint-docs tool to default to the 2024 edition. The lint docs are supposed to illustrate the code with the latest edition, and I just forgot to update this in rust-lang#133349. Some docs needed to add the `edition` attribute since they were assuming a particular edition, but were missing the explicit annotation. This also includes a commit to simplify the edition handling in lint-docs.

Use `search_for_cycle_permutation` to look for `variances_of` This uses `search_for_cycle_permutation` to look for `variances_of` in case `variances_of` is not the first query in the cycle. This may fix rust-lang#124423 and rust-lang#127971. r? `@oli-obk`

matthiaskrgr · 2025-04-27T14:09:15Z

@bors r+ rollup=never p=5

bors · 2025-04-27T14:09:17Z

📌 Commit fdfc7c0 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-04-27T16:39:07Z

⌛ Testing commit fdfc7c0 with merge cb31a00...

bors · 2025-04-27T19:47:32Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing cb31a00 to master...

rust-timer · 2025-04-27T19:48:40Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#140246	Fix never pattern printing	`da738a6dadd7476f0645793f5b594cdb66352365` (link)
#140280	Improve if/else pretty printing	`998049908127b58524f42b48247a358573ca6dda` (link)
#140348	Update lint-docs to default to Rust 2024	`55fcb35d99c6b04b8a212fb825c12dfbc01ae0a2` (link)
#140358	Use `search_for_cycle_permutation` to look for `variances_o…	`d6daad4fbcc3896d2a4e869370e37011c00b2713` (link)

previous master: 267cae5bdb

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

github-actions · 2025-04-27T19:49:27Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 267cae5 (parent) -> cb31a00 (this PR)

Test differences

Show 7 test diffs

Stage 1

[pretty] tests/pretty/hir-if-else.rs: [missing] -> pass (J0)
[pretty] tests/pretty/if-else.rs: [missing] -> pass (J0)
[pretty] tests/pretty/never-pattern.rs: [missing] -> pass (J0)

Stage 2

[pretty] tests/pretty/hir-if-else.rs: [missing] -> pass (J1)
[pretty] tests/pretty/if-else.rs: [missing] -> pass (J1)
[pretty] tests/pretty/never-pattern.rs: [missing] -> pass (J2)
[pretty] tests/pretty/never-pattern.rs: [missing] -> ignore (only executed when the architecture is x86_64) (J3)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard cb31a009e3e735ab08613cec2d8a5a754e65596f --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

dist-aarch64-linux: 5344.9s -> 7806.3s (46.1%)
x86_64-apple-2: 4617.9s -> 5785.8s (25.3%)
dist-apple-various: 7236.7s -> 5995.3s (-17.2%)
dist-aarch64-apple: 4680.5s -> 5032.2s (7.5%)
dist-x86_64-illumos: 6004.3s -> 5580.4s (-7.1%)
aarch64-apple: 4045.2s -> 3806.7s (-5.9%)
x86_64-apple-1: 7709.5s -> 8096.9s (5.0%)
x86_64-gnu-llvm-20-1: 5190.4s -> 4953.6s (-4.6%)
x86_64-gnu-llvm-19-1: 5332.3s -> 5114.7s (-4.1%)
dist-x86_64-apple: 8946.4s -> 8583.1s (-4.1%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2025-04-27T22:09:53Z

Finished benchmarking commit (cb31a00): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary -0.6%, secondary -2.8%)

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.6%	[-0.8%, -0.4%]	4
Improvements ✅ (secondary)	-2.8%	[-3.1%, -2.5%]	2
All ❌✅ (primary)	-0.6%	[-0.8%, -0.4%]	4

Cycles

Results (primary -0.0%, secondary -2.8%)

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.4%	[0.4%, 0.4%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.4%	[-0.4%, -0.4%]	1
Improvements ✅ (secondary)	-2.8%	[-2.8%, -2.8%]	1
All ❌✅ (primary)	-0.0%	[-0.4%, 0.4%]	2

Binary size

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

Bootstrap: 762.088s -> 761.979s (-0.01%)
Artifact size: 365.14 MiB -> 365.07 MiB (-0.02%)

nnethercote and others added 13 commits April 24, 2025 19:19

Add a pretty printing test involving a never pattern.

9f49700

This currently prints badly, with unclosed indentation.

Fix pretty printing of never pattern match arms.

49ca89d

Add pretty printing tests for if/else.

3d488f8

The AST pretty printing is a bit wonky. The HIR pretty printing is extremely wonky.

Fix some pretty printing indents.

ee43aa3

Indents for `cbox` and `ibox` are 0 or `INDENT_UNIT` (4) except for a couple of places which are `INDENT_UNIT - 1` for no clear reason. This commit changes the three space indents to four spaces.

Improve pretty printing of if/else.

e37c367

By removing some of the over-indenting. AST pretty printing now looks correct. HIR pretty printing is better, but still over-indents some.

Use search_for_cycle_permutation to look for variances_of

c33b4f8

Rollup merge of rust-lang#140246 - nnethercote:fix-never-pattern-prin…

4f7aed6

…ting, r=Nadrieril Fix never pattern printing It's currently broken, but there's an easy fix. r? `@Nadrieril`

Rollup merge of rust-lang#140280 - nnethercote:improve-if-else-printi…

405c8af

…ng, r=Urgau Improve if/else pretty printing AST/HIR pretty printing of if/else is currently pretty bad. This PR improves it a lot. r? `@Nadrieril`

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 27, 2025

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 Apr 27, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 27, 2025

bors merged commit cb31a00 into rust-lang:master Apr 27, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 27, 2025

This was referenced Apr 27, 2025

Make missing_fragment_specifier an unconditional error #128425

Merged

Introduce BoxMarker to improve pretty-printing correctness #140316

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 4 pull requests #140366

Rollup of 4 pull requests #140366

Uh oh!

matthiaskrgr commented Apr 27, 2025

Uh oh!

matthiaskrgr commented Apr 27, 2025

Uh oh!

bors commented Apr 27, 2025

Uh oh!

bors commented Apr 27, 2025

Uh oh!

bors commented Apr 27, 2025

Uh oh!

Uh oh!

rust-timer commented Apr 27, 2025

Uh oh!

github-actions bot commented Apr 27, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Apr 27, 2025

Uh oh!

Uh oh!

Rollup of 4 pull requests #140366

Rollup of 4 pull requests #140366

Uh oh!

Conversation

matthiaskrgr commented Apr 27, 2025

Uh oh!

matthiaskrgr commented Apr 27, 2025

Uh oh!

bors commented Apr 27, 2025

Uh oh!

bors commented Apr 27, 2025

Uh oh!

bors commented Apr 27, 2025

Uh oh!

Uh oh!

rust-timer commented Apr 27, 2025

Uh oh!

github-actions bot commented Apr 27, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Apr 27, 2025

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!