Rollup of 3 pull requests#150284

JonathanBrouwer · 2025-12-22T19:11:55Z

Successful merges:

Detail expectation on non-() block tail in if then condition with no else #149928 (Detail expectation on non-() block tail in if then condition with no else)
Don't lint on interior mutable const item coming from derefs #150166 (Don't lint on interior mutable const item coming from derefs)
miri subtree update #150281 (miri subtree update)

r? @ghost
@rustbot modify labels: rollup

This updates the rust-version file to 2cd4ee6.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 2cd4ee6 Filtered ref: 0fa640c05f720805b85aaf146087ed923ab5b9cb Upstream diff: rust-lang/rust@dc47a69...2cd4ee6 This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

This updates the rust-version file to 0208ee0.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 0208ee0 Filtered ref: ed079a53d7211d3e75443b17327b41e9735255f2 Upstream diff: rust-lang/rust@2cd4ee6...0208ee0 This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

add avx512 pshufb

Implement SetFileInformationByHandle, as well as direct shim test for it

This updates the rust-version file to 686f9ce.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 686f9ce Filtered ref: 6797ffd06586bf79776bae0cf8967a6fd406c10a Upstream diff: rust-lang/rust@0208ee0...686f9ce This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

remove spin_loop hint intrinsics we no longer need

Implement FlushFileBuffers

This updates the rust-version file to 526a91c.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 526a91c Filtered ref: 5d2311696042064c979457bed1680763ec8e8f5b Upstream diff: rust-lang/rust@686f9ce...526a91c This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

This updates the rust-version file to f51d1bc.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: f51d1bc Filtered ref: 2ebfe7b93d9b7f9d2dfac7b79e2d473810287782 Upstream diff: rust-lang/rust@526a91c...f51d1bc This merge was created using https://github.com/rust-lang/josh-sync.

Rustup

This updates the rust-version file to cb79c42.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: cb79c42 Filtered ref: 3d67cb5b8f2db0234afa897808f69bf76143044e Upstream diff: rust-lang/rust@f51d1bc...cb79c42 This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

… no `else` When encountering an `if` expression with no `else` where the then block has a tail expression, we emit an E0308 type error. We now explain why `()` was expected.

…exposed_main Tree Borrows: multiple invalid exposed nodes on main subtree

readme: update android state

Detail expectation on non-`()` block tail in `if` then condition with no `else` When encountering an `if` expression with no `else` where the then block has a tail expression, we emit an E0308 type error. We now explain why `()` was expected. Partially address rust-lang#144911.

…vooeo Don't lint on interior mutable `const` item coming from derefs This PR fixes the `const_item_interior_mutations` lint so we don't lint on interior mutable `const` item coming from derefs. Fixes rust-lang#150157

miri subtree update Subtree update of `miri` to rust-lang/miri@4a8db0f. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`

JonathanBrouwer · 2025-12-22T19:12:04Z

@bors r+ rollup=never p=5

bors · 2025-12-22T19:12:07Z

📌 Commit 92c0c35 has been approved by JonathanBrouwer

It is now in the queue for this repository.

bors · 2025-12-22T20:10:00Z

⌛ Testing commit 92c0c35 with merge 4f14395...

bors · 2025-12-22T23:16:58Z

☀️ Test successful - checks-actions
Approved by: JonathanBrouwer
Pushing 4f14395 to main...

rust-timer · 2025-12-22T23:17:53Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#149928	Detail expectation on non-`()` block tail in `if` then cond…	`de7b1244fa78c5289c4dfb31253e791fc5edd676` (link)
#150166	Don't lint on interior mutable `const` item coming from der…	`999021e9c2246b552fa2b849a7f8f90331f306a0` (link)
#150281	miri subtree update	`2fe3cc13b91c744f9f1277cf203c2a7db9310c51` (link)

previous master: 04813e4de8

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-12-22T23:19:54Z

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 04813e4 (parent) -> 4f14395 (this PR)

Test differences

Show 10 test diffs

Stage 1

[ui] tests/ui/lint/const-item-interior-mutations-const-deref.rs: [missing] -> pass (J0)

Stage 2

[ui] tests/ui/lint/const-item-interior-mutations-const-deref.rs: [missing] -> pass (J1)

Additionally, 8 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 4f14395c37db4c1be874e6b0ace6721674223c22 --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

pr-check-1: 1982.4s -> 1683.7s (-15.1%)
aarch64-msvc-1: 7694.9s -> 6805.6s (-11.6%)
i686-gnu-2: 6037.3s -> 5381.7s (-10.9%)
test-various: 7557.1s -> 6777.6s (-10.3%)
aarch64-gnu-llvm-20-2: 3273.3s -> 2954.6s (-9.7%)
x86_64-gnu-miri: 5067.5s -> 4575.2s (-9.7%)
dist-aarch64-apple: 8345.6s -> 7546.0s (-9.6%)
x86_64-gnu-llvm-20-3: 7377.9s -> 6705.8s (-9.1%)
aarch64-gnu-debug: 4352.3s -> 3956.1s (-9.1%)
dist-apple-various: 4575.4s -> 4181.1s (-8.6%)

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-12-22T23:58:32Z

Finished benchmarking commit (4f14395): 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
Improvements ✅ (secondary)	-0.2%	[-0.3%, -0.2%]	2
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary -2.6%)

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)	-2.6%	[-2.9%, -2.2%]	2
All ❌✅ (primary)	-	-	0

Cycles

Results (secondary -1.1%)

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

Binary size

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

Bootstrap: 481.395s -> 480.891s (-0.10%)
Artifact size: 390.31 MiB -> 390.31 MiB (-0.00%)

The Miri Cronjob Bot and others added 30 commits December 14, 2025 04:58

Prepare for merging from rust-lang/rust

ba6b40e

This updates the rust-version file to 2cd4ee6.

Merge pull request rust-lang#4763 from rust-lang/rustup-2025-12-14

bed1817

Automatic Rustup

Prepare for merging from rust-lang/rust

f7a8188

This updates the rust-version file to 0208ee0.

Merge pull request rust-lang#4765 from rust-lang/rustup-2025-12-15

6d58cbd

Automatic Rustup

add avx512 pshufb

fc16679

Merge pull request rust-lang#4764 from usamoi/pshufb

75290e1

add avx512 pshufb

Implement SetFileInformationByHandle, as well as direct shim test for it

15069c2

Merge pull request rust-lang#4547 from CraftSpider/windows-set-len

2be0b30

Implement SetFileInformationByHandle, as well as direct shim test for it

Prepare for merging from rust-lang/rust

c92d39e

This updates the rust-version file to 686f9ce.

Implement FlushFileBuffers

b48defa

Implement direct shim test

b63e6fb

Merge pull request rust-lang#4774 from rust-lang/rustup-2025-12-18

71c7e32

Automatic Rustup

remove spin_loop hint intrinsics we no longer need

3fd2d64

Merge pull request rust-lang#4775 from RalfJung/spin-loop-hint

018c2fe

remove spin_loop hint intrinsics we no longer need

Merge pull request rust-lang#4761 from CraftSpider/windows-sync

7f8cc15

Implement FlushFileBuffers

Prepare for merging from rust-lang/rust

ef494fe

This updates the rust-version file to 526a91c.

fmt

8870bb8

Merge pull request rust-lang#4777 from rust-lang/rustup-2025-12-19

a316ed2

Automatic Rustup

Add regression test for const_item_interior_mutations deref FP

0bc29ce

Don't lint on interior mutable const item coming from derefs

2581c25

Prepare for merging from rust-lang/rust

69c43e8

This updates the rust-version file to f51d1bc.

normalize file name changes away

d11ac79

Merge pull request rust-lang#4780 from RalfJung/rustup

a0d1ff6

Rustup

Prepare for merging from rust-lang/rust

ae6e209

This updates the rust-version file to cb79c42.

RalfJung and others added 10 commits December 21, 2025 14:02

re-bless genmc test

bd051c4

Merge pull request rust-lang#4782 from rust-lang/rustup-2025-12-21

1c9d5e9

Automatic Rustup

Detail expectation on non-() block tail in if then condition with…

42ec5c7

… no `else` When encountering an `if` expression with no `else` where the then block has a tail expression, we emit an E0308 type error. We now explain why `()` was expected.

tree borrows: detect no_valid_exposed_references errors accurately

26ef77a

Merge pull request rust-lang#4757 from royAmmerschuber/feature/multi_…

37e6101

…exposed_main Tree Borrows: multiple invalid exposed nodes on main subtree

readme: update android state

9ae46aa

Merge pull request rust-lang#4783 from RalfJung/android

9d52e4b

readme: update android state

Rollup merge of rust-lang#150281 - RalfJung:miri, r=RalfJung

92c0c35

miri subtree update Subtree update of `miri` to rust-lang/miri@4a8db0f. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 22, 2025

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 Dec 22, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 22, 2025

bors merged commit 4f14395 into rust-lang:main Dec 22, 2025
12 checks passed

rustbot added this to the 1.94.0 milestone Dec 22, 2025

github-actions bot mentioned this pull request Dec 23, 2025

Toolchain upgrade to nightly-2026-02-09 flux-rs/flux#1345

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 3 pull requests#150284