Rollup of 6 pull requests by JonathanBrouwer · Pull Request #156751 · rust-lang/rust

JonathanBrouwer · 2026-05-19T13:04:46Z

Successful merges:

ci: Add dist-aarch64-freebsd #154265 (ci: Add dist-aarch64-freebsd)
miri subtree update #156739 (miri subtree update)
Add support for xray in aarch64 unknown none targets #148666 (Add support for xray in aarch64 unknown none targets)
Move tests closures #156547 (Move tests closures)
Add FileCheck for build_correct_coerce #156578 (Add FileCheck for build_correct_coerce)
[rustdoc] Move span_map file to the right folder #156734 ([rustdoc] Move span_map file to the right folder)

This updates the rust-version file to c8c4c83.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@c8c4c83 Filtered ref: rust-lang/miri@75beaba Upstream diff: rust-lang/rust@63b1dfc...c8c4c83 This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

…ocket-options Support TTL and TCP nodelay socket options

Fix last remnants of TB's Active -> Unique renaming

update test_flock comments

refactor thread block timeout handling

add --native flag to './miri run' to run tests on the host

libc shim fixes

This adds shims for the `readv`, `writev`, `preadv` and `pwritev` functions.

…uwer Rollup of 6 pull requests Successful merges: - #154265 (ci: Add dist-aarch64-freebsd) - #156739 (miri subtree update) - #148666 (Add support for xray in aarch64 unknown none targets) - #156547 (Move tests closures) - #156578 (Add FileCheck for build_correct_coerce) - #156734 ([rustdoc] Move `span_map` file to the right folder)

rust-bors · 2026-05-19T13:42:10Z

💔 Test for 3b2bdff failed: CI. Failed job:

auto - dist-loongarch64-linux (web logs, enhanced plaintext logs)

rust-log-analyzer · 2026-05-19T14:03:11Z

A job failed! Check out the build log: (web) (plain enhanced) (plain)

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

##[endgroup]
Image input checksum af484e9492c8a50ec0ffcbb54903f82dced7f593b9baff2e2d2b30ff4253bb5ac0e7308e3555f1ae79fb052da3177e62b5543ecad809ccae9e3209c0b910c8f7
##[group]Building docker image for dist-i686-linux
Docker version 28.0.4, build b8034c0
Error response from daemon: Get "https://ghcr.io/v2/": Get "https://ghcr.io/token?account=rust-lang&client_id=docker&offline_token=true&service=ghcr.io": context deadline exceeded (Client.Timeout exceeded while awaiting headers) (Client.Timeout exceeded while awaiting headers)
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"
echo "disk usage:"
df -h
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}

rust-log-analyzer · 2026-05-19T14:54:58Z

A job failed! Check out the build log: (web) (plain enhanced) (plain)

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

##[endgroup]
Image input checksum 982446cb1e18eadf25e8e2c34fe4befba0554f33082a27912cb2bdb75f9a57d9e27c6bb31bf27bf1ecafa4b93362fb9ef766290102a91b0b934a2ca07fa5b000
##[group]Building docker image for dist-loongarch64-linux
Docker version 28.0.4, build b8034c0
Error response from daemon: Get "https://ghcr.io/v2/": Get "https://ghcr.io/token?account=rust-lang&client_id=docker&offline_token=true&service=ghcr.io": context deadline exceeded (Client.Timeout exceeded while awaiting headers) (Client.Timeout exceeded while awaiting headers)
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"
echo "disk usage:"
df -h
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}

JonathanBrouwer · 2026-05-19T15:20:31Z

@bors retry

…uwer Rollup of 6 pull requests Successful merges: - #154265 (ci: Add dist-aarch64-freebsd) - #156739 (miri subtree update) - #148666 (Add support for xray in aarch64 unknown none targets) - #156547 (Move tests closures) - #156578 (Add FileCheck for build_correct_coerce) - #156734 ([rustdoc] Move `span_map` file to the right folder)

rust-bors · 2026-05-19T15:29:56Z

💔 Test for f7e11ea failed: CI. Failed job:

auto - dist-loongarch64-musl (web logs, enhanced plaintext logs)

rust-log-analyzer · 2026-05-19T16:18:35Z

A job failed! Check out the build log: (web) (plain enhanced) (plain)

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

##[endgroup]
Image input checksum 2c3805c0c1033758fe55b609915dba12be38d6d4d986ac16188ebab322807551aaf3d2f79c2a93a18ba7f9703853880ed9c0115e68ac47bee03b408f5ee2e609
##[group]Building docker image for dist-loongarch64-musl
Docker version 28.0.4, build b8034c0
Error response from daemon: Get "https://ghcr.io/v2/": Get "https://ghcr.io/token?account=rust-lang&client_id=docker&offline_token=true&service=ghcr.io": context deadline exceeded (Client.Timeout exceeded while awaiting headers) (Client.Timeout exceeded while awaiting headers)
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"
echo "disk usage:"
df -h
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}

JonathanBrouwer · 2026-05-19T16:31:27Z

@bors retry

rust-bors · 2026-05-19T20:01:26Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 29m 34s
Pushing 1ea1171 to main...

rust-timer · 2026-05-19T20:03:17Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#148666	Add support for xray in aarch64 unknown none targets	`1c3730201379b417f5085c62753250fc0afcd9e9` (link)
#154265	ci: Add dist-aarch64-freebsd	`4d5046204b47dd98c57996fc327ed7f762a72b87` (link)
#156547	Move tests closures	`0d3e63ad753b1649c58802ab1e7da7125576a574` (link)
#156578	Add FileCheck for build_correct_coerce	`2df26e28957d76ea046acea946c0f4d156292af7` (link)
#156734	[rustdoc] Move `span_map` file to the right folder	`cf1ce7ce72be10f0a36c77258b74c0b641637687` (link)
#156739	miri subtree update	`facbbab58b5bb1ab5c660583199e906f1c4666d6` (link)

previous master: 60592ad7c6

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 · 2026-05-19T20:04:53Z

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 60592ad (parent) -> 1ea1171 (this PR)

Test differences

Show 95 test diffs

Stage 1

[ui] tests/ui/closures/boxed-closure-captures-fnmut-with-ref.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/boxed-closure-sent-through-thread.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/boxed-closure-with-borrowed-param.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/call-boxed-closure-no-args.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/call-closure-through-lifetime-generic-struct.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/call-fnmut-trait-object-via-ref-mut.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/closure-kind-caching-during-upvar-inference.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/closure-to-fn-pointer-lifetime-error.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/closure-with-fixed-size-array-param.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/debug-info-for-closure-capture.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/destructure-newtype-closure.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/drop-glue-for-closure-with-captures.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/explicit-return-in-closure-and-outer-fn.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/fn-sugar-in-boxed-trait-object.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/hrtb-closure-in-recursive-enum-type-error.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/module-path-not-confused-with-upvar.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/move-closure-can-call-captured-fnmut.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/move-closure-is-send.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/no-unused-mut-warning-for-move-closure.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/pass-lifetime-fn-to-generic-fnonce.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/ref-binding-lifetime-in-closure-pattern.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/region-obligations-closure-and-projection.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/unique-closure-type-mismatch.rs: [missing] -> pass (J0)
[ui] tests/ui/issues/issue-16560.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-16668.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-16671.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-16994.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-17816.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-17897.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-18188.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-19127.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-20174.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-20575.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-22346.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-23046.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-24036.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-26484.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-28181.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-29522.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-32389.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-3424.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-34349.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-3609.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-36260.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-40000.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-46069.rs: pass -> [missing] (J0)

Stage 2

[ui] tests/ui/closures/boxed-closure-captures-fnmut-with-ref.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/boxed-closure-sent-through-thread.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/boxed-closure-with-borrowed-param.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/call-boxed-closure-no-args.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/call-closure-through-lifetime-generic-struct.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/call-fnmut-trait-object-via-ref-mut.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/closure-kind-caching-during-upvar-inference.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/closure-to-fn-pointer-lifetime-error.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/closure-with-fixed-size-array-param.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/debug-info-for-closure-capture.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/destructure-newtype-closure.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/drop-glue-for-closure-with-captures.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/explicit-return-in-closure-and-outer-fn.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/fn-sugar-in-boxed-trait-object.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/hrtb-closure-in-recursive-enum-type-error.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/module-path-not-confused-with-upvar.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/move-closure-can-call-captured-fnmut.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/move-closure-is-send.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/no-unused-mut-warning-for-move-closure.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/pass-lifetime-fn-to-generic-fnonce.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/ref-binding-lifetime-in-closure-pattern.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/region-obligations-closure-and-projection.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/unique-closure-type-mismatch.rs: [missing] -> pass (J1)
[ui] tests/ui/issues/issue-16560.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-16668.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-16671.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-16994.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-17816.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-17897.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-18188.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-19127.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-20174.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-20575.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-22346.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-23046.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-24036.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-26484.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-28181.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-29522.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-32389.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-3424.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-34349.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-3609.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-36260.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-40000.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-46069.rs: pass -> [missing] (J1)

Additionally, 3 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 1ea1171c1e537f295225be1c7b67dba46794e6ad --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

x86_64-rust-for-linux: 35m 21s -> 57m 10s (+61.7%)
x86_64-msvc-ext2: 1h 28m -> 1h 50m (+25.6%)
dist-apple-various: 1h 50m -> 2h 14m (+21.6%)
dist-x86_64-apple: 2h 22m -> 1h 53m (-20.6%)
aarch64-apple: 2h 48m -> 3h 23m (+20.4%)
x86_64-gnu-tools: 56m 13s -> 1h 7m (+19.4%)
pr-check-1: 28m 33s -> 33m 40s (+17.9%)
dist-x86_64-netbsd: 1h 43m -> 1h 25m (-17.2%)
x86_64-gnu-llvm-21-1: 46m 58s -> 54m 58s (+17.0%)
x86_64-gnu-llvm-21: 1h 10m -> 1h 22m (+16.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 · 2026-05-19T20:43:05Z

Finished benchmarking commit (1ea1171): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (secondary -5.4%)

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.4%	[-5.4%, -5.4%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results (primary -2.4%, secondary 7.4%)

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)	7.4%	[3.7%, 11.1%]	2
Improvements ✅ (primary)	-2.4%	[-2.4%, -2.4%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.4%	[-2.4%, -2.4%]	1

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 509.294s -> 509.517s (0.04%)
Artifact size: 402.61 MiB -> 402.61 MiB (-0.00%)

odlot and others added 30 commits May 11, 2026 21:40

Add support for xray in aarch64 unknown none target

c45fc2b

Add support for xray in aarch64 unknown none softfloat target

689279e

docs: Add remark to bring your own runtime if none available

743c6a6

Prepare for merging from rust-lang/rust

2e70d68

This updates the rust-version file to c8c4c83.

fmt

0fbd5a7

feat: finish TTL socket option, add nodelay socket option

c07430c

Merge pull request rust-lang#5035 from rust-lang/rustup-2026-05-13

748e457

Automatic Rustup

turns out we can do 'connect; accept' in a single thread

716b62d

Merge pull request rust-lang#5031 from WhySoBad/network-socket-more-s…

7fdccf5

…ocket-options Support TTL and TCP nodelay socket options

Fix last remnants of TB's Active -> Unique renaming

a0095ae

Adjust tests

0a97587

Merge pull request rust-lang#5037 from JoJoDeveloping/fix-tb-unq-act

5ce1703

Fix last remnants of TB's Active -> Unique renaming

update test_flock comments

cbcae88

Merge pull request rust-lang#5039 from RalfJung/test-flock-comments

50113f8

update test_flock comments

move closures related ui tests into its folder

b502d55

add issue links and bless

3429bdf

Add FileCheck for build_correct_coerce

61e801d

refactor thread block timeout handling

4becc81

Merge pull request rust-lang#5044 from RalfJung/timeouts

d08ba50

refactor thread block timeout handling

add --native flag to './miri run' to run tests on the host

170e6eb

Merge pull request rust-lang#5045 from RalfJung/native

710572c

add --native flag to './miri run' to run tests on the host

fix eventfd writes with too big buffers

a2400e2

libc-epoll-blocking data race test: fix what we are blocking for

68f4a90

libc tests: remove unused features

05731b4

libc-time: expand comment

51af80a

fs: statx always returns MODE; make test pass outside Miri as well

faa411e

fix mkstemp behavior: we should not add the /tmp path

79697e5

Merge pull request rust-lang#5046 from RalfJung/libc-test-fixes

c128457

libc shim fixes

Add shims for vectored reads and vectored writes

af7f76d

This adds shims for the `readv`, `writev`, `preadv` and `pwritev` functions.

rust-bors Bot 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 May 19, 2026

rust-bors Bot 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 19, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot 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 May 19, 2026

rust-bors Bot 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 19, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 19, 2026

rust-bors Bot merged commit 1ea1171 into rust-lang:main May 19, 2026
12 checks passed

rustbot added this to the 1.97.0 milestone May 19, 2026

This was referenced May 19, 2026

Implement RFC 3917 for instrumented functions #153742

Draft

test(chore): audit //@ run-pass in ui tests #154254

Open

Fix jump to def link generation on primitive type associated methods #156736

Open

Uh oh!

Conversation

JonathanBrouwer commented May 19, 2026

Uh oh!

rust-bors Bot commented May 19, 2026

Uh oh!

rust-log-analyzer commented May 19, 2026

Uh oh!

rust-log-analyzer commented May 19, 2026

Uh oh!

JonathanBrouwer commented May 19, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented May 19, 2026

Uh oh!

rust-log-analyzer commented May 19, 2026

Uh oh!

JonathanBrouwer commented May 19, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented May 19, 2026

Uh oh!

Uh oh!

rust-timer commented May 19, 2026

Uh oh!

github-actions Bot commented May 19, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented May 19, 2026

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!

13 participants