Rollup of 5 pull requests #146267

matthiaskrgr · 2025-09-06T11:03:18Z

Successful merges:

move pinned version from tracing_core to tracing #127316 (move pinned version from tracing_core to tracing)
Suggest bounds in more cases, accounting for type parameters referenced in predicate #144801 (Suggest bounds in more cases, accounting for type parameters referenced in predicate)
Disallow shebang in --cfg and --check-cfg arguments #146211 (Disallow shebang in --cfg and --check-cfg arguments)
Fix bump-stage0 build failure, and check-build bump-stage0 in CI #146263 (Fix bump-stage0 build failure, and check-build bump-stage0 in CI)
miri std tests: skip all of sys:: #146266 (miri std tests: skip all of sys::)

r? @ghost
@rustbot modify labels: rollup

…ed in predicate

required features reexported from tracing

- We pick the higest common `toml` version used in the r-l/r workspace to avoid introducing Yet Another `toml` `0.x` version, which happens to be `0.8.23` as of the time of writing. - We introduce a byte-buffer-to-string workaround for the `toml 0.8.*` series that do not have the `toml 0.9.*` series's `toml::from_slice` API yet. Not efficient, but this is not perf-critical so it's fine.

To catch obvious build failures of the `src/tools/bump-stage0` early, before we find out it can't even build when we really need it to work.

move pinned version from tracing_core to tracing This PR removes pin from `tracing-core` and moves it to `tracing`, which regressed perf in > 0.1.37 versions.

Suggest bounds in more cases, accounting for type parameters referenced in predicate Use a `ty::Visitor` to see if the failed predicate references a type parameter. If it does, then we only suggest adding a bound to an (associated) item only if the referenced parameter is present in its generics. Provide adding bound suggestion in trait and impl associated functions in cases we previously weren't: ``` error[E0277]: `?` couldn't convert the error to `ApplicationError` --> $DIR/suggest-complex-bound-on-method.rs:18:16 | LL | t.run()?; | -----^ the trait `From<<T as Trait>::Error>` is not implemented for `ApplicationError` | | | this can't be annotated with `?` because it has type `Result<_, <T as Trait>::Error>` | note: `ApplicationError` needs to implement `From<<T as Trait>::Error>` --> $DIR/suggest-complex-bound-on-method.rs:12:1 | LL | enum ApplicationError { | ^^^^^^^^^^^^^^^^^^^^^ = note: the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait help: consider introducing a `where` clause, but there might be an alternative better way to express this requirement | LL | fn thing<T: Trait>(&self, t: T) -> Result<(), ApplicationError> where ApplicationError: From<<T as Trait>::Error> { | +++++++++++++++++++++++++++++++++++++++++++++++++ ``` Fix rust-lang#144734.

Disallow shebang in `--cfg` and `--check-cfg` arguments This PR is similar to rust-lang#146130, where we disallowed frontmatter in `--cfg` and `--check-cfg` arguments. While fixing the other one we also discovered that shebang `#!/usr/bin/shebang` are currently also allowed in `--cfg` and `--check-cfg` arguments. Allowing shebang in them (which are just ignored) was never intended, this PR fixes that by not stripping shebang for `--cfg` and `--check-cfg` arguments. This is technically a breaking-change, although I don't expect anyone to actually rely on this unintended behavior. Fixes rust-lang#146130 (comment) r? fmease

Fix `bump-stage0` build failure, and check-build `bump-stage0` in CI This PR bumps the `toml` dependency of the `bump-stage0` tool to `0.8.23`, which AFAICT is the highest `toml` version that's present in the r-l/r workspace's `Cargo.lock` already (so we don't introduce _another_ `toml 0.x.*` series). I added some byte-buffer-to-string intermediary to workaround `toml 0.8.*` not having the `toml 0.9.*` `toml::from_slice` API. To catch obvious build failures of the `src/tools/bump-stage0` tool early, before we find out it can't even build when we really need it to work. Contexts: - rust-lang#146250 (comment) - [#t-release > Bump stage0 rustfmt separately ("one-off") @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/241545-t-release/topic/Bump.20stage0.20rustfmt.20separately.20.28.22one-off.22.29/near/537916615) Fixes rust-lang#146252.

miri std tests: skip all of sys:: Matches rust-lang/miri-test-libstd#104

matthiaskrgr · 2025-09-06T11:03:36Z

@bors r+ rollup=never p=5

bors · 2025-09-06T11:03:39Z

📌 Commit 6f5fad5 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-09-06T12:10:25Z

⌛ Testing commit 6f5fad5 with merge 6d5caf3...

bors · 2025-09-06T15:20:09Z

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

rust-timer · 2025-09-06T15:21:36Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#127316	move pinned version from tracing_core to tracing	`3141bd7257da0ccf2c91c8fde99f6a89aa5e094c` (link)
#144801	Suggest bounds in more cases, accounting for type parameter…	`81b19972576b4614cde6b730c89cffb6177542b5` (link)
#146211	Disallow shebang in `--cfg` and `--check-cfg` arguments	`19ce11f3933ab1a833b715b8e4af76bb9c54ebdc` (link)
#146263	Fix `bump-stage0` build failure, and check-build `bump-stag…	`c4ae4bddd5c9758bd0b7c5e7e45deb6505ccf7e8` (link)
#146266	miri std tests: skip all of sys::	`d02ad35bf38e3c196a62da5518205de1550ef230` (link)

previous master: 0d0f4eac8b

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-09-06T15:23:38Z

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 0d0f4ea (parent) -> 6d5caf3 (this PR)

Test differences

Show 7 test diffs

Stage 1

[ui] tests/ui/traits/bound/suggest-complex-bound-on-method.rs: [missing] -> pass (J2)

Stage 2

sys::os_str::bytes::tests::display: pass -> [missing] (J0)
sys::os_str::bytes::tests::slice_debug_output: pass -> [missing] (J0)
sys::personality::dwarf::tests::dwarf_reader: pass -> [missing] (J0)
sys::thread_local::key::tests::destructors: pass -> [missing] (J0)
sys::thread_local::key::tests::smoke: pass -> [missing] (J0)
[ui] tests/ui/traits/bound/suggest-complex-bound-on-method.rs: [missing] -> pass (J1)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 6d5caf3a4a358c80f09ba51d71db0dbc41381992 --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-x86_64-apple: 7286.9s -> 8410.6s (15.4%)
dist-aarch64-apple: 8201.1s -> 7069.4s (-13.8%)
dist-aarch64-msvc: 5716.3s -> 5196.0s (-9.1%)
dist-x86_64-solaris: 5042.1s -> 5486.5s (8.8%)
aarch64-gnu-llvm-19-1: 3587.6s -> 3330.6s (-7.2%)
aarch64-apple: 6031.0s -> 5645.9s (-6.4%)
aarch64-gnu: 6956.8s -> 6523.1s (-6.2%)
dist-x86_64-netbsd: 4669.2s -> 4951.7s (6.0%)
x86_64-gnu-tools: 3325.4s -> 3519.8s (5.8%)
dist-aarch64-linux: 8298.5s -> 8780.0s (5.8%)

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-09-06T16:29:20Z

Finished benchmarking commit (6d5caf3): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.1%	[-0.2%, -0.1%]	2
Improvements ✅ (secondary)	-0.3%	[-0.7%, -0.1%]	15
All ❌✅ (primary)	-0.1%	[-0.2%, -0.1%]	2

Max RSS (memory usage)

Results (primary -3.8%, secondary 1.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)	3.7%	[2.3%, 5.1%]	2
Improvements ✅ (primary)	-3.8%	[-6.1%, -1.5%]	2
Improvements ✅ (secondary)	-3.7%	[-3.7%, -3.7%]	1
All ❌✅ (primary)	-3.8%	[-6.1%, -1.5%]	2

Cycles

Results (primary 0.3%)

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

	mean	range	count
Regressions ❌ (primary)	2.3%	[2.3%, 2.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.7%	[-1.7%, -1.7%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[-1.7%, 2.3%]	2

Binary size

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

Bootstrap: 469.522s -> 469.247s (-0.06%)
Artifact size: 390.39 MiB -> 390.35 MiB (-0.01%)

estebank and others added 13 commits August 4, 2025 16:12

Suggest bounds in more cases, accounting for type parameters referenc…

fa6986e

…ed in predicate

unpin tracing_core

17b27d8

rustc_log: remove direct dep on tracing_core

267d3c8

required features reexported from tracing

Disallow shebang in --cfg and --check-cfg arguments

d224d3a

bootstrap: add check step for src/tools/bump-stage0

d5e6121

ci: check src/tools/bump-stage0 in pr-check-2

312a124

To catch obvious build failures of the `src/tools/bump-stage0` early, before we find out it can't even build when we really need it to work.

miri std tests: skip all of sys::

9fc8374

Rollup merge of rust-lang#127316 - klensy:tracing-bump, r=Kobzol

020edbe

move pinned version from tracing_core to tracing This PR removes pin from `tracing-core` and moves it to `tracing`, which regressed perf in > 0.1.37 versions.

Rollup merge of rust-lang#146266 - RalfJung:miri-nosys, r=jieyouxu

6f5fad5

miri std tests: skip all of sys:: Matches rust-lang/miri-test-libstd#104

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 Sep 6, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 6, 2025

bors merged commit 6d5caf3 into rust-lang:master Sep 6, 2025
11 checks passed

rustbot added this to the 1.91.0 milestone Sep 6, 2025

bors mentioned this pull request Sep 6, 2025

Update tracing and fix binary regression #146188

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests #146267

Rollup of 5 pull requests #146267

Uh oh!

matthiaskrgr commented Sep 6, 2025 •

edited by rustbot

Loading

Uh oh!

matthiaskrgr commented Sep 6, 2025

Uh oh!

bors commented Sep 6, 2025

Uh oh!

bors commented Sep 6, 2025

Uh oh!

bors commented Sep 6, 2025

Uh oh!

Uh oh!

rust-timer commented Sep 6, 2025

Uh oh!

github-actions bot commented Sep 6, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Sep 6, 2025

Uh oh!

Uh oh!

Rollup of 5 pull requests #146267

Rollup of 5 pull requests #146267

Uh oh!

Conversation

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

Uh oh!

Uh oh!

matthiaskrgr commented Sep 6, 2025

Uh oh!

bors commented Sep 6, 2025

Uh oh!

bors commented Sep 6, 2025

Uh oh!

bors commented Sep 6, 2025

Uh oh!

Uh oh!

rust-timer commented Sep 6, 2025

Uh oh!

github-actions bot commented Sep 6, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Sep 6, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

matthiaskrgr commented Sep 6, 2025 •

edited by rustbot

Loading