Rollup of 5 pull requests #146812

matthiaskrgr · 2025-09-20T15:55:06Z

Successful merges:

generate list of all variants with target_spec_enum #144592 (generate list of all variants with target_spec_enum)
Fix and provide instructions for running test suite on Apple simulators #146762 (Fix and provide instructions for running test suite on Apple simulators)
fixes for numerous clippy warnings #146770 (fixes for numerous clippy warnings)
Allow running x <cmd> <path> from a different directory #146774 (Allow running x <cmd> <path> from a different directory)
Fix unsupported std::sys::thread after move #146800 (Fix unsupported std::sys::thread after move)

r? @ghost
@rustbot modify labels: rollup

This helps us avoid the hardcoded lists elsewhere.

Fixes building std for any platform with an unsupported thread abstraction. This includes {aarch64,armv7,x86_64}-unknown-trusty and riscv32im-risc0-zkvm-elf, which explicitly include the unsupported module, and platforms with no PAL. Bug fix for PR 145177 (std: move thread into sys).

The macro is now builtin.

…oratrieb generate list of all variants with `target_spec_enum` This helps us avoid the hardcoded lists elsewhere. r? ``@Noratrieb``

Fix and provide instructions for running test suite on Apple simulators The following now works: ```sh ./x test --host='' --target aarch64-apple-ios-sim --skip tests/debuginfo ./x test --host='' --target aarch64-apple-tvos-sim --skip tests/debuginfo ./x test --host='' --target aarch64-apple-watchos-sim --skip tests/debuginfo ./x test --host='' --target aarch64-apple-visionos-sim --skip tests/debuginfo ``` I have documented the setup I used [in the `rustc-dev-guide`](https://rustc-dev-guide.rust-lang.org/tests/running.html#testing-on-emulators), it's fairly standard use of `remote-test-server` (with a small fix to library load paths which I've made in the first commit). I first tried the somewhat simpler `target.aarch64-apple-ios-sim.runner = "xcrun simctl spawn $UDID"`, but that doesn't work as required libraries etc. also need to be copied to the device. The debuginfo tests fail, I think because the debug info in `.dSYM` isn't available. I am yet unsure exactly how to fix this, either we need to copy that directory to the target as well, or we need to configure `lldb` somehow to read it from the host. I decided to not add this to our CI, since I suspect we wouldn't gain much from it? Running on the simulator still uses the host Darwin kernel, it's basically just configured to run in another mode with more restricted permissions and different system libraries. r? jieyouxu CC ``@simlay,`` you're a lot more familiar with `xcrun simctl` than I.

fixes for numerous clippy warnings

…jieyouxu Allow running `x <cmd> <path>` from a different directory Fixes: rust-lang#146772 r? ``@jieyouxu``

…=joboet Fix unsupported `std::sys::thread` after move Fixes building std for any platform with an unsupported thread abstraction. This includes {aarch64,armv7,x86_64}-unknown-trusty and riscv32im-risc0-zkvm-elf, which explicitly include the unsupported module, and platforms with no PAL. Bug fix for rust-lang#145177 (std: move thread into sys). Also fix the `std` build for xtensa, which I incidentally found while looking for an unsupported platform. r? ``@joboet``

matthiaskrgr · 2025-09-20T15:55:29Z

@bors r+ rollup=never p=5

bors · 2025-09-20T15:55:31Z

📌 Commit 48c1249 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-09-20T16:33:27Z

⌛ Testing commit 48c1249 with merge dd7fda5...

bors · 2025-09-20T19:43:37Z

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

rust-timer · 2025-09-20T19:45:03Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#144592	generate list of all variants with `target_spec_enum`	`ef16611fafc42273683f30312e71cee2fc3daf14` (link)
#146762	Fix and provide instructions for running test suite on Appl…	`08acc6565e4ae86bbd1b6372dba71aeee20f0d47` (link)
#146770	fixes for numerous clippy warnings	`6a860ea3851aea68f135b2291744201c29261e73` (link)
#146774	Allow running `x <cmd> <path>` from a different directory	`a8d174264b1585dcdae61468101f691d7f020b8b` (link)
#146800	Fix unsupported `std::sys::thread` after move	`e7abce316e73c2c1df676bb2a842fe7dda9399d3` (link)

previous master: 9f2ef0f14d

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-20T19:47:08Z

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 9f2ef0f (parent) -> dd7fda5 (this PR)

Test differences

Show 276 test diffs

Stage 2

[ui] tests/ui/backtrace/apple-no-dsymutil.rs: ignore (only executed when the target vendor is Apple) -> ignore (ignored when running tests remotely (needs the compiler-produced .o file to be copied to the device)) (J0)
[ui] tests/ui/compiletest-self-test/test-aux-bin.rs: ignore (ignored when cross-compiling (because aux-bin does not yet support it)) -> ignore (ignored when running tests remotely (because aux-bin does not yet support it)) (J0)
[ui] tests/ui/runtime/on-broken-pipe/child-processes.rs#default: ignore (ignored when cross-compiling (because aux-bin does not yet support it)) -> ignore (ignored when running tests remotely (because aux-bin does not yet support it)) (J0)
[ui] tests/ui/runtime/on-broken-pipe/child-processes.rs#error: ignore (ignored when cross-compiling (because aux-bin does not yet support it)) -> ignore (ignored when running tests remotely (because aux-bin does not yet support it)) (J0)
[ui] tests/ui/runtime/on-broken-pipe/child-processes.rs#inherit: ignore (ignored when cross-compiling (because aux-bin does not yet support it)) -> ignore (ignored when running tests remotely (because aux-bin does not yet support it)) (J0)
[ui] tests/ui/runtime/on-broken-pipe/child-processes.rs#kill: ignore (ignored when cross-compiling (because aux-bin does not yet support it)) -> ignore (ignored when running tests remotely (because aux-bin does not yet support it)) (J0)
[ui] tests/ui/runtime/on-broken-pipe/inherit.rs: ignore (ignored when cross-compiling (because aux-bin does not yet support it)) -> ignore (ignored when running tests remotely (because aux-bin does not yet support it)) (J0)
[ui] tests/ui/process/env-funky-keys.rs: ignore (ignored when the operating system is android) -> ignore (ignored when the operating system is android (segfaults)) (J1)

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

Job group index

J0: arm-android, armhf-gnu
J1: arm-android

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard dd7fda570040e8a736f7d8bc28ddd1b444aabc82 --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-loongarch64-musl: 5262.3s -> 5932.3s (12.7%)
dist-x86_64-apple: 7743.2s -> 6782.3s (-12.4%)
dist-apple-various: 3575.9s -> 3979.3s (11.3%)
dist-various-1: 3748.6s -> 4091.0s (9.1%)
dist-x86_64-windows-gnullvm: 5226.9s -> 4776.3s (-8.6%)
dist-x86_64-illumos: 6463.7s -> 6031.4s (-6.7%)
aarch64-msvc-1: 6463.6s -> 6874.1s (6.4%)
x86_64-gnu-tools: 3468.5s -> 3270.0s (-5.7%)
dist-x86_64-mingw: 9041.8s -> 8554.5s (-5.4%)
dist-ohos-x86_64: 4348.2s -> 4137.2s (-4.9%)

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-20T20:54:33Z

Finished benchmarking commit (dd7fda5): 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 2.4%, secondary 1.4%)

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

	mean	range	count
Regressions ❌ (primary)	2.4%	[2.2%, 2.8%]	4
Regressions ❌ (secondary)	2.4%	[2.2%, 2.9%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.9%	[-1.9%, -1.9%]	1
All ❌✅ (primary)	2.4%	[2.2%, 2.8%]	4

Cycles

Results (primary 2.0%, secondary 1.6%)

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

	mean	range	count
Regressions ❌ (primary)	2.0%	[2.0%, 2.0%]	1
Regressions ❌ (secondary)	2.8%	[2.5%, 3.0%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.6%	[-2.7%, -2.5%]	2
All ❌✅ (primary)	2.0%	[2.0%, 2.0%]	1

Binary size

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

Bootstrap: 471.07s -> 472.936s (0.40%)
Artifact size: 389.99 MiB -> 389.95 MiB (-0.01%)

madsmtm and others added 14 commits September 19, 2025 10:52

Allow running remote-test-server on Apple simulators

be01d87

Document how to test with iOS/tvOS/watchOS/visionOS simulator

b30c1b5

Fix test suite in iOS/tvOS/watchOS/visionOS simulator

37be934

Allow running x <cmd> <path> from a different directory

58814bc

fixes for numerous clippy warnings

54b15a6

generate list of all variants with target_spec_enum

4841d8c

This helps us avoid the hardcoded lists elsewhere.

Fix std build for xtensa

776c199

Update cfg_if! to cfg_select!

db4d4ef

The macro is now builtin.

Rollup merge of rust-lang#144592 - fee1-dead-contrib:target_spec, r=N…

5f8062b

…oratrieb generate list of all variants with `target_spec_enum` This helps us avoid the hardcoded lists elsewhere. r? ``@Noratrieb``

Rollup merge of rust-lang#146770 - hkBst:clippy-fix-10, r=fmease

016420a

fixes for numerous clippy warnings

Rollup merge of rust-lang#146774 - Kobzol:bootstrap-relative-path, r=…

f5725f0

…jieyouxu Allow running `x <cmd> <path>` from a different directory Fixes: rust-lang#146772 r? ``@jieyouxu``

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

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

bors merged commit dd7fda5 into rust-lang:master Sep 20, 2025
11 checks passed

rustbot added this to the 1.92.0 milestone Sep 20, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests #146812

Rollup of 5 pull requests #146812

Uh oh!

matthiaskrgr commented Sep 20, 2025 •

edited by rustbot

Loading

Uh oh!

matthiaskrgr commented Sep 20, 2025

Uh oh!

bors commented Sep 20, 2025

Uh oh!

bors commented Sep 20, 2025

Uh oh!

bors commented Sep 20, 2025

Uh oh!

Uh oh!

rust-timer commented Sep 20, 2025

Uh oh!

github-actions bot commented Sep 20, 2025

Stage 2

Uh oh!

rust-timer commented Sep 20, 2025

Uh oh!

Uh oh!

Rollup of 5 pull requests #146812

Rollup of 5 pull requests #146812

Uh oh!

Conversation

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

Uh oh!

Uh oh!

matthiaskrgr commented Sep 20, 2025

Uh oh!

bors commented Sep 20, 2025

Uh oh!

bors commented Sep 20, 2025

Uh oh!

bors commented Sep 20, 2025

Uh oh!

Uh oh!

rust-timer commented Sep 20, 2025

Uh oh!

github-actions bot commented Sep 20, 2025

Test differences

Stage 2

Job duration changes

Uh oh!

rust-timer commented Sep 20, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

matthiaskrgr commented Sep 20, 2025 •

edited by rustbot

Loading