Rollup of 7 pull requests #140388

GuillaumeGomez · 2025-04-28T11:30:48Z

Successful merges:

Fix a wrong error message in 2024 edition #140056 (Fix a wrong error message in 2024 edition)
Fix detection of main function if there are expressions around it #140220 (Fix detection of main function if there are expressions around it)
Remove weak alias terminology #140249 (Remove weak alias terminology)
Introduce BoxMarker to improve pretty-printing correctness #140316 (Introduce BoxMarker to improve pretty-printing correctness)
ci: clean more disk space in codebuild #140347 (ci: clean more disk space in codebuild)
ci: use aws codebuild for the dist-x86_64-linux job #140349 (ci: use aws codebuild for the dist-x86_64-linux job)
rustc-dev-guide subtree update #140379 (rustc-dev-guide subtree update)

r? @ghost
@rustbot modify labels: rollup

add newlines between prefix/suffix chapters in SUMMARY.md to ensure correct extraction by mdbook-i18n-helpers.

- Rust backcompat removes the need to specify the version here - Using these commands can result in a needless toolchain getting downloaded, like in the case where user only has Nightly installed

…d-instr update build and test instructions

typo

… inside a function

toolchain version does not need to be specified

fix(docs): add newlines between prefix/suffix chapters

…ocks use correct code block markers

copy-paste ease

replace command that does not work

Rustc pull update

The pretty-printers open and close "boxes" of text a lot. The open and close operations must be matched. The matching is currently all implicit and very easy to get wrong. (rust-lang#140280 and rust-lang#140246 are two recent pretty-printing fixes that both involved unclosed boxes.) This commit introduces `BoxMarker`, a marker type that represents an open box. It makes box opening/closing explicit, which makes it much easier to understand and harder to get wrong. The commit also removes many comments are on `end` calls saying things like "end outer head-block", "Close the outer-box". These demonstrate how confusing the implicit approach was, but aren't necessary any more.

GuillaumeGomez · 2025-04-28T11:30:59Z

@bors r+ p=5 rollup=never

bors · 2025-04-28T11:31:02Z

📌 Commit dd3ca71 has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2025-04-28T11:35:54Z

⌛ Testing commit dd3ca71 with merge 6655f5c...

…llaumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#140056 (Fix a wrong error message in 2024 edition) - rust-lang#140220 (Fix detection of main function if there are expressions around it) - rust-lang#140249 (Remove `weak` alias terminology) - rust-lang#140316 (Introduce `BoxMarker` to improve pretty-printing correctness) - rust-lang#140347 (ci: clean more disk space in codebuild) - rust-lang#140349 (ci: use aws codebuild for the `dist-x86_64-linux` job) - rust-lang#140379 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2025-04-28T14:12:50Z

The job x86_64-mingw-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

---- [run-make] tests\run-make\amdgpu-kd stdout ----

error: rmake recipe failed to complete
status: exit code: 1
command: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make\\amdgpu-kd\\rmake.exe"
stdout: none
--- stderr -------------------------------
command failed at line 18
Command { cmd: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\stage2\\bin\\rustc.exe" "-L" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make\\amdgpu-kd\\rmake_out" "--crate-name" "foo" "--target=amdgcn-amd-amdhsa" "-Ctarget-cpu=gfx900" "--crate-type" "cdylib" "foo.rs", stdin_buf: None, stdin: None, stdout: None, stderr: None, drop_bomb: DropBomb { command: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\stage2\\bin\\rustc.exe", defused: true, armed_location: Location { file: "D:\\a\\rust\\rust\\tests\\run-make\\amdgpu-kd\\rmake.rs", line: 12, col: 5 } }, already_executed: true }
output status: `exit code: 1`
=== STDOUT ===



=== STDERR ===
error: linking with `rust-lld` failed: exit code: 0xc0000374
  |
  = note: "rust-lld" "-flavor" "gnu" "--version-script=C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustch5txN7\\list" "--no-undefined-version" "<1 object files omitted>" "--as-needed" "-L" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustch5txN7\\raw-dylibs" "-Bdynamic" "--eh-frame-hdr" "-z" "noexecstack" "-L" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make\\amdgpu-kd\\rmake_out" "-o" "foo.elf" "--gc-sections" "-shared"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: 

error: aborting due to 1 previous error
------------------------------------------
---
test result: FAILED. 279 passed; 1 failed; 110 ignored; 0 measured; 6 filtered out; finished in 202.94s

Some tests failed in compiletest suite=run-make mode=run-make host=x86_64-pc-windows-gnu target=x86_64-pc-windows-gnu
Build completed unsuccessfully in 2:28:20
make: *** [Makefile:124: ci-mingw-x] Error 1
  local time: Mon Apr 28 14:12:18 CUT 2025
  network time: Mon, 28 Apr 2025 14:12:18 GMT
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version

bors · 2025-04-28T14:13:18Z

💔 Test failed - checks-actions

ChrisDenton · 2025-04-28T15:11:00Z

spurious

@bors retry x86_64-mingw-1 0xc0000374

bors · 2025-04-28T17:22:15Z

⌛ Testing commit dd3ca71 with merge 25cdf1f...

rust-highfive · 2025-04-28T20:28:06Z

📣 Toolstate changed by #140388!

Tested on commit 25cdf1f.
Direct link to PR: #140388

💔 reference on windows: test-pass → test-fail (cc @ehuss).
💔 reference on linux: test-pass → test-fail (cc @ehuss).

@ehuss

Tested on commit rust-lang/rust@25cdf1f. Direct link to PR: <rust-lang/rust#140388> 💔 reference on windows: test-pass → test-fail (cc @ehuss). 💔 reference on linux: test-pass → test-fail (cc @ehuss).

bors · 2025-04-28T20:29:14Z

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

github-actions · 2025-04-28T20:31:07Z

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 7d65abf (parent) -> 25cdf1f (this PR)

Test differences

Show 8 test diffs

Stage 1

[ui] tests/rustdoc-ui/doctest/macro-after-main.rs: [missing] -> pass (J0)
[ui] tests/rustdoc-ui/doctest/test-main-alongside-exprs.rs: [missing] -> pass (J0)

Stage 2

[ui] tests/rustdoc-ui/doctest/macro-after-main.rs: [missing] -> pass (J1)
[ui] tests/rustdoc-ui/doctest/test-main-alongside-exprs.rs: [missing] -> pass (J1)

Additionally, 4 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 25cdf1f67463c9365d8d83778c933ec7480e940b --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-arm-linux: 3456.9s -> 6261.6s (81.1%)
dist-aarch64-linux: 5480.9s -> 7688.6s (40.3%)
dist-x86_64-mingw: 7434.0s -> 9140.9s (23.0%)
x86_64-apple-1: 7256.8s -> 8119.9s (11.9%)
dist-aarch64-apple: 4672.3s -> 5184.4s (11.0%)
dist-x86_64-linux: 5555.9s -> 4994.8s (-10.1%)
i686-msvc-1: 9172.8s -> 10079.0s (9.9%)
dist-apple-various: 6409.8s -> 5839.6s (-8.9%)
x86_64-apple-2: 5323.5s -> 5737.7s (7.8%)
x86_64-gnu-llvm-19-1: 5186.8s -> 5547.5s (7.0%)

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-28T20:31:14Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#140056	Fix a wrong error message in 2024 edition	`d17b7f61e47b3d955ba3ffc936d2c6595af6d870` (link)
#140220	Fix detection of main function if there are expressions aro…	`4f8ada3a92a69b926a855805b7273af20bc4d327` (link)
#140249	Remove `weak` alias terminology	`676258125ecaa2a0ee386d4311857f47227ed794` (link)
#140316	Introduce `BoxMarker` to improve pretty-printing correctness	`811001142947076865ab8fda8a87f6eff86d3823` (link)
#140347	ci: clean more disk space in codebuild	`3c44de5caa192bf27dcaa2865f7628f28815f8cd` (link)
#140349	ci: use aws codebuild for the `dist-x86_64-linux` job	`58cb389ea83ffbe73206abf143f65efb6086d66e` (link)
#140379	rustc-dev-guide subtree update	`79423ca0196dc2cb74480da44c83f0be10ebdab1` (link)

previous master: 7d65abfe80

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 · 2025-04-28T22:00:35Z

Finished benchmarking commit (25cdf1f): comparison URL.

Overall result: ✅ improvements - 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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.6%	[-0.6%, -0.6%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 0.6%, secondary 3.5%)

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.7%	[0.4%, 1.5%]	11
Regressions ❌ (secondary)	3.5%	[2.3%, 4.8%]	2
Improvements ✅ (primary)	-0.4%	[-0.4%, -0.4%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.6%	[-0.4%, 1.5%]	12

Cycles

Results (primary -0.2%, secondary 3.0%)

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)	1.2%	[0.9%, 1.6%]	2
Regressions ❌ (secondary)	3.0%	[3.0%, 3.0%]	1
Improvements ✅ (primary)	-0.6%	[-0.9%, -0.4%]	6
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-0.9%, 1.6%]	8

Binary size

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

Bootstrap: 765.314s -> 765.701s (0.05%)
Artifact size: 365.17 MiB -> 365.36 MiB (0.05%)

hwhsu1231 and others added 30 commits April 18, 2025 18:49

fix(docs): add newlines between prefix/suffix chapters

399cf1f

add newlines between prefix/suffix chapters in SUMMARY.md to ensure correct extraction by mdbook-i18n-helpers.

toolchain version does not need to be specified

1b5f2aa

- Rust backcompat removes the need to specify the version here - Using these commands can result in a needless toolchain getting downloaded, like in the case where user only has Nightly installed

update build and test instructions

e9896cc

Merge pull request rust-lang#2350 from rust-lang/update-autodiff-buil…

deed996

…d-instr update build and test instructions

Fix detection of main function if there are expressions around it

3536324

Add regression ui test for rust-lang#140162 and for rust-lang#139651

81438c0

Preparing for merge from rustc

745500f

Merge from rustc

1b315ad

Remove weak alias terminology

bdfeb8f

typo

ba6dd90

Merge pull request rust-lang#2353 from rust-lang/tshepang-patch-1

e6472b3

typo

Improve code

3ededc1

If there is a ; alone, we consider that the doctest needs to be put…

3ef98a5

… inside a function

Fix error message for static references or mutable references

bffb760

Merge pull request rust-lang#2345 from rust-lang/extraneous

7a70f33

toolchain version does not need to be specified

Merge pull request rust-lang#2343 from hwhsu1231-fork/fix-prefix-chapter

3945ae9

fix(docs): add newlines between prefix/suffix chapters

use correct code block markers

79faff2

Merge pull request rust-lang#2354 from rust-lang/tshepang-fix-code-bl…

26a60d4

…ocks use correct code block markers

copy-paste ease

9eeadbf

Merge pull request rust-lang#2355 from rust-lang/tshepang-patch-1

e40391a

copy-paste ease

replace command that does not work

9c4d568

Merge pull request rust-lang#2356 from rust-lang/tshepang-patch-2

89bb181

replace command that does not work

Fix bad handling of macros if there is already a main function

aa69e3a

ci: clean more disk space in codebuild

474466d

Merge pull request rust-lang#2351 from rust-lang/rustc-pull

d91ffb6

Preparing for merge from rustc

de491f9

Merge from rustc

aa15830

Merge pull request rust-lang#2358 from rust-lang/rustc-pull

1b53c12

Rustc pull update

Use PrintState::head in PrintState::block_to_string.

61a66b1

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 28, 2025

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 28, 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 28, 2025

ChrisDenton added the CI-spurious-fail-rust-lld-crash CI spurious failure: `rust-lld` crashing / SIGSEGV / 0xc0000374 heap corruption label Apr 28, 2025

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

bors merged commit 25cdf1f into rust-lang:master Apr 28, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 28, 2025

GuillaumeGomez deleted the rollup-aj9o3ch branch April 28, 2025 20:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests #140388

Rollup of 7 pull requests #140388

Uh oh!

GuillaumeGomez commented Apr 28, 2025

Uh oh!

GuillaumeGomez commented Apr 28, 2025

Uh oh!

bors commented Apr 28, 2025

Uh oh!

bors commented Apr 28, 2025

Uh oh!

rust-log-analyzer commented Apr 28, 2025

Uh oh!

bors commented Apr 28, 2025

Uh oh!

ChrisDenton commented Apr 28, 2025

Uh oh!

bors commented Apr 28, 2025

Uh oh!

rust-highfive commented Apr 28, 2025

Uh oh!

bors commented Apr 28, 2025

Uh oh!

Uh oh!

github-actions bot commented Apr 28, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Apr 28, 2025

Uh oh!

rust-timer commented Apr 28, 2025

Uh oh!

Uh oh!

Rollup of 7 pull requests #140388

Rollup of 7 pull requests #140388

Uh oh!

Conversation

GuillaumeGomez commented Apr 28, 2025

Uh oh!

GuillaumeGomez commented Apr 28, 2025

Uh oh!

bors commented Apr 28, 2025

Uh oh!

bors commented Apr 28, 2025

Uh oh!

rust-log-analyzer commented Apr 28, 2025

Uh oh!

bors commented Apr 28, 2025

Uh oh!

ChrisDenton commented Apr 28, 2025

Uh oh!

bors commented Apr 28, 2025

Uh oh!

rust-highfive commented Apr 28, 2025

Uh oh!

bors commented Apr 28, 2025

Uh oh!

Uh oh!

github-actions bot commented Apr 28, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Apr 28, 2025

Uh oh!

rust-timer commented Apr 28, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!