Rollup of 10 pull requests by JonathanBrouwer · Pull Request #156405 · rust-lang/rust

JonathanBrouwer · 2026-05-10T17:05:49Z

Successful merges:

miri subtree update #156394 (miri subtree update)
Implement core::arch::return_address and tests #154972 (Implement core::arch::return_address and tests)
rustdoc: Reify emission types #155679 (rustdoc: Reify emission types)
Fix closure HIR span context mismatch #155982 (Fix closure HIR span context mismatch)
Handle --print=backend-has-mnemonic in cg_clif #156323 (Handle --print=backend-has-mnemonic in cg_clif)
std fs tests: avoid matching on OS-provided error string #156387 (std fs tests: avoid matching on OS-provided error string)
compiletest: Migrate from PassMode/FailMode to PassFailMode #156129 (compiletest: Migrate from PassMode/FailMode to PassFailMode)
core: Replace ptr::slice_from_raw_parts with slice::from_raw_parts #156192 (core: Replace ptr::slice_from_raw_parts with slice::from_raw_parts)
stream_send_recv_stress tests: wait for threads to finish #156365 (stream_send_recv_stress tests: wait for threads to finish)
Fix invalid unreachable in is_known_valid_scrutinee for Reborrow #156368 (Fix invalid unreachable in is_known_valid_scrutinee for Reborrow)

* Implement core::arch::return_address and tests Fix typo Apply suggestions from code review Wording/docs changes. Co-authored-by: Ralf Jung <post@ralfj.de> Change signature according to Ralf's comment Fix call to `core::intrinsics::return_address()` according to the new signature Add cranelift implementation for intrinsic Change wording on `return_address!()` to be clear that returning a null pointer is best-effort. Fix formatting of doc comment Fix mistake in cranelift codegen * Do not generate llvm.returnaddress on wasm * Supress return_address test on miri

Previously it only worked for bound and listening sockets and returned an unspecified address otherwise.

This updates the rust-version file to 045b177.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@045b177 Filtered ref: rust-lang/miri@729eed7 Upstream diff: rust-lang/rust@44860d3...045b177 This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

…kname-for-connected-sockets Add `getsockname` shim for connecting and connected sockets

…tartup

avoid underflow in std::Instant when computing times before program startup

…-wsa-error-fix Remove `WSAESHUTDOWN` workaround for network socket writes

Add epoll integration for network sockets

This commit introduces `PassFailMode` as an internal detail of `TestProps`, but the full migration is left to a subsequent commit.

Using those shims socket addresses can be created directly from hostnames (e.g. using `ToSocketAddrs` from the standard library)

Add `getaddrinfo` and `freeaddrinfo` shims

This updates the rust-version file to 4ddd453.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@4ddd453 Filtered ref: rust-lang/miri@99593b4 Upstream diff: rust-lang/rust@045b177...4ddd453 This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

This updates the rust-version file to 32bd660.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@32bd660 Filtered ref: rust-lang/miri@771a0a0 Upstream diff: rust-lang/rust@4ddd453...32bd660 This merge was created using https://github.com/rust-lang/josh-sync.

JonathanBrouwer · 2026-05-10T17:06:12Z

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-2

rust-bors · 2026-05-10T17:06:15Z

📌 Commit cfd0d4c has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 10 pull requests try-job: dist-various-1 try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1 try-job: i686-msvc-2

rust-bors · 2026-05-10T20:05:29Z

☀️ Try build successful (CI)
Build commit: 0da9b30 (0da9b30008e74299dbfd4f1ed68a8b76dcfaf553, parent: 99eed207b47aca1fec5c665531db8e948a92d0ca)

rust-bors · 2026-05-10T23:07:54Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 8m 54s
Pushing 4b0c9d7 to main...

github-actions · 2026-05-10T23:10:47Z

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 e8f92f5 (parent) -> 4b0c9d7 (this PR)

Test differences

Show 21 test diffs

Stage 1

[codegen] tests/codegen-llvm/intrinsics/return_address.rs: [missing] -> pass (J0)
[ui] tests/rustdoc-ui/output-format-doctest-emit.rs#dep-info: [missing] -> pass (J0)
[ui] tests/rustdoc-ui/output-format-doctest-emit.rs#html-static-files: [missing] -> pass (J0)
[ui] tests/ui/proc-macro/closure-hir-span.rs: [missing] -> pass (J0)
[ui] tests/ui/reborrow/reborrow_let_match.rs: [missing] -> pass (J0)
fs::tests::test_rename_directory_to_non_empty_directory: [missing] -> pass (J1)
fs::tests::test_rename_file_over_open_file: [missing] -> pass (J1)
[codegen] tests/codegen-llvm/intrinsics/return_address.rs: [missing] -> ignore (ignored when the target family is wasm) (J6)

Stage 2

[ui] tests/rustdoc-ui/output-format-doctest-emit.rs#dep-info: [missing] -> pass (J2)
[ui] tests/rustdoc-ui/output-format-doctest-emit.rs#html-static-files: [missing] -> pass (J2)
fs::tests::test_rename_directory_to_non_empty_directory: [missing] -> pass (J3)
fs::tests::test_rename_file_over_open_file: [missing] -> pass (J3)
[ui] tests/ui/proc-macro/closure-hir-span.rs: [missing] -> pass (J4)
[ui] tests/ui/reborrow/reborrow_let_match.rs: [missing] -> pass (J4)
[codegen] tests/codegen-llvm/intrinsics/return_address.rs: [missing] -> pass (J5)

Additionally, 6 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 4b0c9d76ae7d387229caea55cfa73c280b08b8a7 --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-musl: 1h 43m -> 2h 12m (+27.6%)
dist-i686-msvc: 1h 47m -> 2h 16m (+26.2%)
i686-msvc-2: 2h 17m -> 1h 42m (-25.5%)
dist-powerpc64le-linux-gnu: 1h 16m -> 1h 36m (+25.5%)
armhf-gnu: 1h 34m -> 1h 10m (-25.2%)
dist-arm-linux-musl: 1h 20m -> 1h 39m (+24.2%)
x86_64-mingw-1: 2h 12m -> 2h 42m (+23.0%)
dist-x86_64-freebsd: 1h 31m -> 1h 11m (-22.3%)
pr-check-1: 33m 30s -> 27m 23s (-18.3%)
dist-x86_64-mingw: 2h 36m -> 2h 8m (-18.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 · 2026-05-10T23:10:51Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#154972	Implement `core::arch::return_address` and tests	`af4b370aba01834a9916a2c1cda19d29634c371b` (link)
#155679	rustdoc: Reify emission types	`944fa8fa3f7b5e79118315d57e7a5d5b0fdb133a` (link)
#155982	Fix closure HIR span context mismatch	`f68cbe5b79c60a6235a48ae10c98b483eb51e669` (link)
#156129	compiletest: Migrate from `PassMode`/`FailMode` to `PassFai…	`092204d21eea7bdbb0ef6c0bba704742cd14c245` (link)
#156192	core: Replace `ptr::slice_from_raw_parts` with `slice::from…	`685d17b59e96feeef1117ef6910904a25b51c202` (link)
#156323	Handle --print=backend-has-mnemonic in cg_clif	`1e9f67c02a1961d39c34f16f74a943db94fea414` (link)
#156365	stream_send_recv_stress tests: wait for threads to finish	`1027e0b38ad7f103d5682cda7a76a4ff4e77de01` (link)
#156368	Fix invalid unreachable in is_known_valid_scrutinee for Reb…	`ec10a1d945a6d131c85365c382dcd7b000d4c470` (link)
#156387	std fs tests: avoid matching on OS-provided error string	`21efb7211a7cf6020b15423932a7fc5bb6805137` (link)
#156394	miri subtree update	`757ccc33b2be5cdba133d92ba647bb425504cae7` (link)

previous master: e8f92f5769

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2026-05-10T23:49:29Z

Finished benchmarking commit (4b0c9d7): 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 (primary -1.5%, secondary -2.0%)

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

Cycles

Results (primary -2.1%, secondary -0.3%)

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.0%	[2.7%, 3.3%]	2
Improvements ✅ (primary)	-2.1%	[-2.1%, -2.1%]	1
Improvements ✅ (secondary)	-3.6%	[-5.0%, -2.1%]	2
All ❌✅ (primary)	-2.1%	[-2.1%, -2.1%]	1

Binary size

Results (primary 0.1%, 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.1%	[0.0%, 0.3%]	30
Regressions ❌ (secondary)	0.1%	[0.0%, 0.1%]	19
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[0.0%, 0.3%]	30

Bootstrap: 501.011s -> 497.552s (-0.69%)
Artifact size: 397.14 MiB -> 397.27 MiB (0.03%)

chorman0773 and others added 30 commits April 26, 2026 11:56

Fix cfg use for disabling test on miri

706d098

fix closure HIR span context mismatch

06cb86d

Final attempt at making miri work

c876de4

Add getsockname shim for connecting and connected sockets

dfc5fd5

Previously it only worked for bound and listening sockets and returned an unspecified address otherwise.

Prepare for merging from rust-lang/rust

fdab736

This updates the rust-version file to 045b177.

Merge pull request rust-lang#5002 from rust-lang/rustup-2026-05-04

eb5adcc

Automatic Rustup

Merge pull request rust-lang#4985 from WhySoBad/network-socket-getsoc…

8948418

…kname-for-connected-sockets Add `getsockname` shim for connecting and connected sockets

avoid underflow in std::Instant when computing times before program s…

c79b2c4

…tartup

Merge pull request rust-lang#5003 from RalfJung/time-underflow

342fd9e

avoid underflow in std::Instant when computing times before program startup

fix: remove WSAESHUTDOWN workaround for socket writes

8e91dd7

Merge pull request rust-lang#5004 from WhySoBad/network-socket-remove…

8b1b282

…-wsa-error-fix Remove `WSAESHUTDOWN` workaround for network socket writes

core: Replace ptr::slice_from_raw_parts with slice::from_raw_parts

df26762

Add epoll integration for network sockets

38f567f

Merge pull request rust-lang#4973 from WhySoBad/network-socket-epoll-new

5e796af

Add epoll integration for network sockets

Reformat string_enum!

b7548cb

Replace pass_mode and fail_mode fields with pass_fail_mode

bd0533d

This commit introduces `PassFailMode` as an internal detail of `TestProps`, but the full migration is left to a subsequent commit.

Migrate from PassMode/FailMode to PassFailMode

78c27e9

Use a match for checking UI test run results

529a4ec

Add getaddrinfo and freeaddrinfo shims

81d92de

Using those shims socket addresses can be created directly from hostnames (e.g. using `ToSocketAddrs` from the standard library)

Merge pull request rust-lang#4984 from WhySoBad/network-socket-dns

8e9c315

Add `getaddrinfo` and `freeaddrinfo` shims

Prepare for merging from rust-lang/rust

27def62

This updates the rust-version file to 4ddd453.

fmt

cdc427a

bless genmc tests

172929a

Merge pull request rust-lang#5006 from rust-lang/rustup-2026-05-07

5721600

Automatic Rustup

try to remove generic normalization from backtraces

f9bc18d

Prepare for merging from rust-lang/rust

289b5af

This updates the rust-version file to 32bd660.

rust-bors Bot added the rollup A PR which is a rollup label May 10, 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 10, 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 10, 2026

rust-bors Bot merged commit 4b0c9d7 into rust-lang:main May 10, 2026
13 checks passed

rustbot added this to the 1.97.0 milestone May 10, 2026

This was referenced May 10, 2026

Fix short backtraces from stripped executables #151740

Open

[do not merge] core::mem::replace using core::mem::swap #154575

Open

compiletest: make some internals pub for use as a library #154997

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 10 pull requests#156405

Rollup of 10 pull requests#156405
rust-bors[bot] merged 69 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-yJcad1j

JonathanBrouwer commented May 10, 2026

Uh oh!

JonathanBrouwer commented May 10, 2026

Uh oh!

rust-bors Bot commented May 10, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented May 10, 2026

Uh oh!

rust-bors Bot commented May 10, 2026

Uh oh!

Uh oh!

github-actions Bot commented May 10, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented May 10, 2026

Uh oh!

rust-timer commented May 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Uh oh!

Conversation

JonathanBrouwer commented May 10, 2026

Uh oh!

JonathanBrouwer commented May 10, 2026

Uh oh!

rust-bors Bot commented May 10, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented May 10, 2026

Uh oh!

rust-bors Bot commented May 10, 2026

Uh oh!

Uh oh!

github-actions Bot commented May 10, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented May 10, 2026

Uh oh!

rust-timer commented May 10, 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