Rollup of 6 pull requests #149276

matthiaskrgr · 2025-11-24T18:10:47Z

Successful merges:

rustdoc: make mergeable crate info more usable #148234 (rustdoc: make mergeable crate info more usable)
Add suggest alternatives for Out-of-range \x escapes #149201 (Add suggest alternatives for Out-of-range \x escapes)
[rustdoc] Make more functions return fmt::Result and reduce number of .unwrap() calls #149208 ([rustdoc] Make more functions return fmt::Result and reduce number of .unwrap() calls)
miri: use tikv-jemalloc-sys from sysroot #149252 (miri: use tikv-jemalloc-sys from sysroot)
Use let...else consistently in user-facing diagnostics #149255 (Use let...else consistently in user-facing diagnostics)
Fix missing double-quote in std::env::consts::OS values #149275 (Fix missing double-quote in std::env::consts::OS values)

r? @ghost
@rustbot modify labels: rollup

This fixes a limitation that prevented me from adding it to Cargo. The rust compiler-docs bundle is built by running multiple `cargo` commands in succession, and I want to support that, so I'm stuck putting the doc parts all in one directory, so that subsequent `cargo` runs can pick up the previous runs' data. It's less clean, but it should still be usable in hermetic build environments if you give every crate its own directory (which you needed to do before, oddly enough).

This allows LTO to work when compiling jemalloc, which should yield a small performance boost, and makes miri's behaviour here match clippy and rustdoc.

…p()` calls

rustdoc: make mergeable crate info more usable Part of rust-lang#130676 Adds documentation and a feature change aimed at making this usable without breaking backwards compat. cc ``@EtomicBomb``

Add suggest alternatives for Out-of-range \x escapes Fixes rust-lang#148917 seems add two notes seems better. r? `@scottmcm`

…amofek,lolbinarycat [rustdoc] Make more functions return `fmt::Result` and reduce number of `.unwrap()` calls Following our discussion in rust-lang#149028 (comment), this PR makes more function return `fmt::Result`, allowing to use `?` a lot more, and also reducing number of `.unwrap()` calls. r? `@lolbinarycat`

miri: use `tikv-jemalloc-sys` from sysroot This allows LTO to work when compiling jemalloc (which is currently broken due to rust-lang/cc-rs#1613), which should yield a small performance boost, and makes Miri's behaviour here match Clippy and Rustdoc. Follow-up to rust-lang#148925 / rust-lang#146627 after discussion in rust-lang#148925 (review). r? RalfJung

Use `let...else` consistently in user-facing diagnostics resolve: rust-lang#148772 Standardize `let...else` terminology in user-facing diagnostics. Goal: Consistently use `let...else` in all error/warning messages. Internal technical names (`let-else`) in comments and documentation remain unchanged. cc ``@carols10cents,`` ``@jieyouxu``

Fix missing double-quote in `std::env::consts::OS` values Noticed this one while reading the docs. Hopefully it's not too small change.

matthiaskrgr · 2025-11-24T18:11:03Z

@bors r+ rollup=never p=5

bors · 2025-11-24T18:11:06Z

📌 Commit 5ec55d3 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-11-24T20:22:11Z

⌛ Testing commit 5ec55d3 with merge c871d09...

bors · 2025-11-24T23:32:44Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing c871d09 to main...

rust-timer · 2025-11-24T23:34:31Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#148234	rustdoc: make mergeable crate info more usable	`f56e7060eee927abf3792b55313ca28032d5e951` (link)
#149201	Add suggest alternatives for Out-of-range \x escapes	`93d7e18eb90a9085990cc55a23587398aae4e22e` (link)
#149208	[rustdoc] Make more functions return `fmt::Result` and redu…	`a7fce4e716e2a1f39009b156b0a7fef291543230` (link)
#149252	miri: use `tikv-jemalloc-sys` from sysroot	`8eee4e783c7a6c93e8f5486f2405d93e2eebb5ad` (link)
#149255	Use `let...else` consistently in user-facing diagnostics	`ae46eb038fac7fb574f30d3cd4e8b0586362a5bb` (link)
#149275	Fix missing double-quote in `std::env::consts::OS` values	`962779f5afed3321814b91f561c9e6fbaff80295` (link)

previous master: b64df9d101

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-11-24T23:35:34Z

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 b64df9d (parent) -> c871d09 (this PR)

Test differences

Show 7 test diffs

Stage 1

[run-make] tests/run-make/rustdoc-merge-directory: [missing] -> pass (J0)
[ui] tests/ui/parser/out-of-range-hex-escape-suggestions-148917.rs: [missing] -> pass (J0)

Stage 2

[run-make] tests/run-make/rustdoc-merge-directory: [missing] -> ignore (ignored if target does not support std) (J1)
[ui] tests/ui/parser/out-of-range-hex-escape-suggestions-148917.rs: [missing] -> pass (J2)
[run-make] tests/run-make/rustdoc-merge-directory: [missing] -> pass (J3)

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

Job group index

J0: x86_64-gnu-llvm-20-3, x86_64-gnu-llvm-21-3
J1: dist-various-1
J2: aarch64-apple, aarch64-gnu, aarch64-gnu-llvm-20-1, aarch64-msvc-1, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-gnu, x86_64-gnu-debug, x86_64-gnu-gcc, x86_64-gnu-llvm-20, x86_64-gnu-llvm-20-2, x86_64-gnu-llvm-21-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
J3: aarch64-apple, aarch64-gnu, aarch64-gnu-debug, aarch64-gnu-llvm-20-1, aarch64-msvc-1, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-gnu, x86_64-gnu-debug, x86_64-gnu-gcc, x86_64-gnu-llvm-20-2, x86_64-gnu-llvm-21-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard c871d09d1cc32a649f4c5177bb819646260ed120 --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

tidy: 160.5s -> 196.7s (+22.6%)
dist-x86_64-apple: 9342.1s -> 7451.4s (-20.2%)
aarch64-apple: 8516.5s -> 10090.8s (+18.5%)
x86_64-gnu-aux: 6214.7s -> 6901.3s (+11.0%)
aarch64-gnu-llvm-20-2: 2274.5s -> 2497.8s (+9.8%)
x86_64-gnu-llvm-21-2: 5723.0s -> 5171.4s (-9.6%)
arm-android: 5651.1s -> 6177.9s (+9.3%)
x86_64-gnu-tools: 3359.5s -> 3671.8s (+9.3%)
armhf-gnu: 5003.8s -> 5416.2s (+8.2%)
x86_64-rust-for-linux: 2631.5s -> 2847.2s (+8.2%)

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-11-25T00:52:02Z

Finished benchmarking commit (c871d09): 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 (primary 1.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Cycles

Results (secondary -5.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Binary size

Results (primary 0.0%, secondary 0.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	0.0%	[0.0%, 0.1%]	21
Regressions ❌ (secondary)	0.1%	[0.0%, 0.1%]	22
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[0.0%, 0.1%]	21

Bootstrap: 470.372s -> 469.468s (-0.19%)
Artifact size: 388.20 MiB -> 388.26 MiB (0.02%)

notriddle and others added 13 commits October 27, 2025 14:47

rustdoc: add mergeable CCI docs to the unstable feature book

24be917

Use let...else consistently in user-facing diagnostics

d3e4dd2

miri: use tikv-jemalloc-sys from sysroot

522e47f

This allows LTO to work when compiling jemalloc, which should yield a small performance boost, and makes miri's behaviour here match clippy and rustdoc.

Make more functions return fmt::Result and reduce number of `.unwra…

c524ed7

…p()` calls

Add suggest alternatives for Out-of-range \x escapes

4d4f315

Fix missing double-quote in std::env::consts::OS values

6173a56

Rollup merge of rust-lang#148234 - notriddle:doc-cci, r=GuillaumeGomez

be49e00

rustdoc: make mergeable crate info more usable Part of rust-lang#130676 Adds documentation and a feature change aimed at making this usable without breaking backwards compat. cc ``@EtomicBomb``

Rollup merge of rust-lang#149201 - chenyukang:fix-str-format, r=Kivooeo

ade1581

Add suggest alternatives for Out-of-range \x escapes Fixes rust-lang#148917 seems add two notes seems better. r? `@scottmcm`

Rollup merge of rust-lang#149275 - KeyWeeUsr:fix-solid-os-typo, r=bjorn3

5ec55d3

Fix missing double-quote in `std::env::consts::OS` values Noticed this one while reading the docs. Hopefully it's not too small change.

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 Nov 24, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 24, 2025

bors merged commit c871d09 into rust-lang:main Nov 24, 2025
12 checks passed

rustbot added this to the 1.93.0 milestone Nov 24, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests #149276

Rollup of 6 pull requests #149276

matthiaskrgr commented Nov 24, 2025 •

edited by rustbot

Loading

Uh oh!

matthiaskrgr commented Nov 24, 2025

Uh oh!

bors commented Nov 24, 2025

Uh oh!

bors commented Nov 24, 2025

Uh oh!

bors commented Nov 24, 2025

Uh oh!

Uh oh!

rust-timer commented Nov 24, 2025

Uh oh!

github-actions bot commented Nov 24, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Nov 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Rollup of 6 pull requests #149276

Rollup of 6 pull requests #149276

Conversation

matthiaskrgr commented Nov 24, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthiaskrgr commented Nov 24, 2025

Uh oh!

bors commented Nov 24, 2025

Uh oh!

bors commented Nov 24, 2025

Uh oh!

bors commented Nov 24, 2025

Uh oh!

Uh oh!

rust-timer commented Nov 24, 2025

Uh oh!

github-actions bot commented Nov 24, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Nov 25, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

matthiaskrgr commented Nov 24, 2025 •

edited by rustbot

Loading