Rollup of 6 pull requests #141545

GuillaumeGomez · 2025-05-25T13:11:50Z

Successful merges:

Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING #141413 (Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING)
make teach_help message for cast-before-pass-to-variadic more precise #141443 (make teach_help message for cast-before-pass-to-variadic more precise)
bootstrap: clippy: set TESTNAME based on given paths #141508 (bootstrap: clippy: set TESTNAME based on given paths)
Avoid extra path trimming in method not found error #141512 (Avoid extra path trimming in method not found error)
Added unstable feature doc comments to unstable book #141530 (Added unstable feature doc comments to unstable book)
Random nits #141541 (Random nits)

r? @ghost
@rustbot modify labels: rollup

Method errors have an extra check that force trim paths whenever the normal string is longer than 10 characters, which can be quite unhelpful when multiple items have the same name (for example an `Error`). A user reported this force trimming as being quite unhelpful when they had a method error where the precise path of the `Error` mattered. The code uses `tcx.short_string` already to get the normal path, which tries to be clever around trimming paths if necessary, so there is no reason for this extra force trimming.

This addresses issue 104200 by setting the TESTNAME environment variable automatically based on the paths from run configs, marking a selected set of UI tests to be run. Note that this does not filter out other unit tests using #[test].

Co-authored-by: Jubilee <[email protected]>

…escriptions

Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING The `#[cfg(version(...))]` feature is currently under-tested. Part of it is the difficulty that it is hard to write a test that never changes, while the version of the Rust compiler indeed *does* change. PR rust-lang#81468 added the first and so far only test of `#[cfg(version(...))]`'s functionality (there is one other test for the *syntax*, that also acts as feature gate). But that test uses a proc macro that parses the version: the text of the test doesn't contain the actual `#[cfg(version(...))]`. This PR makes `#[cfg(version(...))]` respect `RUSTC_OVERRIDE_VERSION_STRING`, added by PR rust-lang#124339, allowing us to virtually pin the rustc version and write tests from all directions against some specific version. The PR also adds a functional test of `#[cfg(version(...))]` that leverages `RUSTC_OVERRIDE_VERSION_STRING`. Pulled out of rust-lang#141137. Tracking issue: rust-lang#64796

…workingjubilee make teach_help message for cast-before-pass-to-variadic more precise r? `@workingjubilee` based on your comment [here](rust-lang#44930 (comment))

…zkan bootstrap: clippy: set TESTNAME based on given paths This addresses rust-lang#104200 by setting the TESTNAME environment variable automatically based on the paths from run configs, marking a selected set of UI tests to be run. Note that this does not filter out other unit tests using #[test].

… r=compiler-errors Avoid extra path trimming in method not found error Method errors have an extra check that force trim paths whenever the normal string is longer than 10 characters, which can be quite unhelpful when multiple items have the same name (for example an `Error`). A user reported this force trimming as being quite unhelpful when they had a method error where the precise path of the `Error` mattered. The code uses `tcx.short_string` already to get the normal path, which tries to be clever around trimming paths if necessary, so there is no reason for this extra force trimming.

…omments, r=Urgau Added unstable feature doc comments to unstable book This PR adds doc comments for unstables features in [compiler/rustc_feature/src/unstable.rs](https://github.com/rust-lang/rust/blob/d3a2440384b54664dddd56e0081ca094c444e869/compiler/rustc_feature/src/unstable.rs#L190-L191) to the unstable book feature pages. Fixes rust-lang#141528 Example features rendered ![image](https://github.com/user-attachments/assets/2b65f534-26f8-441f-ba29-65554c9154b7) ![image](https://github.com/user-attachments/assets/6077491b-ddaf-447e-9519-0bc110c7a893) r? `@jyn514`

Random nits Two completely random commits that I didn't know where to integrate into another PR. * Don't use the full type relation machinery to equate two regions (it's overkill). * Add a comment that `select_in_new_trait_solver` shouldn't be used directly. r? lcnr or reassign

GuillaumeGomez · 2025-05-25T13:12:15Z

@bors r+ p=5 rollup=never

bors · 2025-05-25T13:12:18Z

📌 Commit 43cb506 has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2025-05-25T14:46:31Z

⌛ Testing commit 43cb506 with merge 283db70...

bors · 2025-05-25T17:55:40Z

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

rust-timer · 2025-05-25T17:57:24Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#141413	Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING	`448653b719ae72ff03c562a73ebeebb7d2ed3702` (link)
#141443	make teach_help message for cast-before-pass-to-variadic mo…	`693eaef48100a3b0459f7f48313f04bfb625aeea` (link)
#141508	bootstrap: clippy: set TESTNAME based on given paths	`8e823626a891b48ad3cf64eebc3a8b6d9568e250` (link)
#141512	Avoid extra path trimming in method not found error	`9c75faff25dc3d750ee9968830757d1e6ca4b802` (link)
#141530	Added unstable feature doc comments to unstable book	`e498d664c3cbbf0bddcb56dd12d4882ea68c157e` (link)
#141541	Random nits	`cbc363a78c73ec934e575b4c496c03e69c4c5cc0` (link)

previous master: 88b3b520e8

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-05-25T17:58:18Z

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 88b3b52 (parent) -> 283db70 (this PR)

Test differences

Show 4 test diffs

Stage 1

[ui] tests/ui/cfg/cfg-version/cfg-version-expand.rs: [missing] -> pass (J1)
[ui] tests/ui/methods/untrimmed-path-type.rs: [missing] -> pass (J1)

Stage 2

[ui] tests/ui/cfg/cfg-version/cfg-version-expand.rs: [missing] -> pass (J0)
[ui] tests/ui/methods/untrimmed-path-type.rs: [missing] -> pass (J0)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 283db70ace62a0ae704a624e43b68c2ee44b87a6 --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-apple-various: 6694.8s -> 5980.3s (-10.7%)
x86_64-apple-1: 6870.0s -> 6342.2s (-7.7%)
dist-loongarch64-musl: 5275.8s -> 5617.9s (6.5%)
mingw-check: 1267.4s -> 1193.3s (-5.8%)
dist-ohos-aarch64: 4711.5s -> 4446.0s (-5.6%)
x86_64-msvc-ext3: 7590.0s -> 7957.2s (4.8%)
dist-x86_64-netbsd: 4903.6s -> 5108.6s (4.2%)
dist-ohos-armv7: 4234.4s -> 4398.7s (3.9%)
x86_64-msvc-ext1: 7137.1s -> 6871.2s (-3.7%)
dist-ohos-x86_64: 4594.1s -> 4437.0s (-3.4%)

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-05-25T19:25:01Z

Finished benchmarking commit (283db70): 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)	-2.9%	[-2.9%, -2.9%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.9%	[-2.9%, -2.9%]	1

Max RSS (memory usage)

Results (primary -4.0%, secondary -0.9%)

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)	3.9%	[3.9%, 3.9%]	1
Regressions ❌ (secondary)	2.2%	[2.2%, 2.2%]	1
Improvements ✅ (primary)	-6.6%	[-10.1%, -1.5%]	3
Improvements ✅ (secondary)	-2.4%	[-2.6%, -2.3%]	2
All ❌✅ (primary)	-4.0%	[-10.1%, 3.9%]	4

Cycles

Results (primary -3.0%, secondary 2.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)	-	-	0
Regressions ❌ (secondary)	2.0%	[2.0%, 2.0%]	1
Improvements ✅ (primary)	-3.0%	[-3.0%, -3.0%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-3.0%	[-3.0%, -3.0%]	1

Binary size

Results (primary -1.1%)

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)	-1.1%	[-1.1%, -1.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.1%	[-1.1%, -1.1%]	1

Bootstrap: 775.765s -> 775.708s (-0.01%)
Artifact size: 366.27 MiB -> 366.25 MiB (-0.01%)

RalfJung and others added 14 commits May 23, 2025 15:03

make teach_help message for cast-before-pass-to-variadic more precise

180ab16

Make #[cfg(version)] respect RUSTC_OVERRIDE_VERSION_STRING

f3245e4

fix help message

4e8b8da

Co-authored-by: Jubilee <[email protected]>

Don't use relation just to equate regions in response

7820d2c

Comment for not using select_in_new_trait_solver

9a8cf3d

feat(unstable-book): Added unstable feature doc comments as feature d…

3850b1f

…escriptions

Rollup merge of rust-lang#141443 - RalfJung:c-variadic-teach-help, r=…

d72bc29

…workingjubilee make teach_help message for cast-before-pass-to-variadic more precise r? `@workingjubilee` based on your comment [here](rust-lang#44930 (comment))

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 May 25, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label May 25, 2025

bors merged commit 283db70 into rust-lang:master May 25, 2025
1 check passed

rustbot added this to the 1.89.0 milestone May 25, 2025

bors mentioned this pull request May 25, 2025

Enhance error reporting for write!/writeln! macros #139371

Open

GuillaumeGomez deleted the rollup-myrvuqq branch May 26, 2025 08:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests #141545

Rollup of 6 pull requests #141545

Uh oh!

GuillaumeGomez commented May 25, 2025 •

edited by rustbot

Loading

Uh oh!

GuillaumeGomez commented May 25, 2025

Uh oh!

bors commented May 25, 2025

Uh oh!

bors commented May 25, 2025

Uh oh!

bors commented May 25, 2025

Uh oh!

Uh oh!

rust-timer commented May 25, 2025

Uh oh!

github-actions bot commented May 25, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented May 25, 2025

Uh oh!

Uh oh!

Rollup of 6 pull requests #141545

Rollup of 6 pull requests #141545

Uh oh!

Conversation

GuillaumeGomez commented May 25, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented May 25, 2025

Uh oh!

bors commented May 25, 2025

Uh oh!

bors commented May 25, 2025

Uh oh!

bors commented May 25, 2025

Uh oh!

Uh oh!

rust-timer commented May 25, 2025

Uh oh!

github-actions bot commented May 25, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented May 25, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

GuillaumeGomez commented May 25, 2025 •

edited by rustbot

Loading