Rollup of 4 pull requests by JonathanBrouwer · Pull Request #162596 · rust-lang/rust

JonathanBrouwer · 2026-09-10T14:05:10Z

Successful merges:

Fix soundness issues in std::sys::pal::sgx::waitqueue::unsafe_list #161334 (Fix soundness issues in std::sys::pal::sgx::waitqueue::unsafe_list)
Implement arbitrary casts in custom mir #160860 (Implement arbitrary casts in custom mir)
Simplify diagnostic levels #162514 (Simplify diagnostic levels)
Gate ELF code in metadata.rs for ELF only #162542 (Gate ELF code in metadata.rs for ELF only)

…c location and add more unit tests.

Randomness generation failure is an abnormal circumstance that should lead to program termination. It's not reasonable to let consumers of `std` functionality catch such failures and resume from the.

These are dead since the old emitter was removed in Jan 2026 (3ccabc6). Also removed: `BRIGHT_BLUE`, `Level::color`, and a couple of `level` fn parameters.

It has a single use, where it is passed in to `format_diag_messages` which then discards it. So that use can be replaced with `Style::NoStyle`.

`format_diag_messages` always constructs a `String`, so it can just return that. This simplifies various call sites.

When there's a single message, `format_diag_message` suffices.

Current `Level` is used for both diagnostics and subdiagnostics. But both diagnostics and subdiagnostics only use some of the levels. This commit introduces `Sublevel` to tighten up the representation and prevent impossible combinations.

Use the `FatalError` re-export from `rustc_errors` instead of `rustc_span`, because that's what's normally done.

@nia-e

Fix soundness issues in std::sys::pal::sgx::waitqueue::unsafe_list Replace invalid uses of references in `std::sys::pal::sgx::waitqueue::unsafe_list` internals with raw pointers. I tried to keep the code structure the same as much as possible. In addition to the use of references flagged in the original issue, it turns out the head/tail (raw) pointer stored in the linked list caused provenance issues in miri. Switched to using UnsafePinned for that. PR organization: * Commit 1: Main soundness fix. * Commit 2: Use pinning in the `pub(crate)` API for UnsafeList. This code predates pinning in Rust. I believe this change isn't strictly necessary as I believe it's valid to document pinning requirements in the unsafe methods on UnsafeList. However, I felt it's better to be explicit about this now that pinning is available in the language. * Commit 3: Move UnsafeList to a platform-agnostic location so miri can be run on the test suite. This also adds some tests. This PR was developed with Claude Fable 5 through extensive interactive use, where I directed a detailed plan for making the changes needed for this fix. My input includes keeping the structure the same and the new internal abstraction for dealing with raw pointers. I'm not familiar with miri, I used Claude to test the changes with miri. It said the test suite was failing before the changes (both stacked borrows and tree borrows) but passing after. The additional tests developed this way have been added in the third commit. The head/tail pointer provenance issue was found with Claude. I thoroughly reviewed all the code, including comments, and made manual changes/deletions where necessary/appropriate. The PR description was written by me. r? @nia-e Fixes rust-lang#114581 Fixes rust-lang#160603 Fixes rust-lang#161060 Supersedes rust-lang#160641

Implement arbitrary casts in custom mir [See zulip](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/extending.20custom.20MIR/with/613727602) Implement custom casts using an enum in `intrinsics::mir` that closely matches the `CastKind` enum in the compiler. We have 5 different ways to cast in custom MIR, 3 with functions (which hard code a cast kind), 1 implicit coerce (which only does subtyping i think), 1 with `as` (which does a few more). They are all different and the error messages don't tell you what to do. Some are (i think) not possible at all. This came up [while testing miri](https://rust-lang.zulipchat.com/#narrow/channel/136281-t-opsem/topic/Valdity.20checks.20for.20references/near/613662285). We currently have to guess the casting syntax until we find the one that generates the MIR we want. This PR changes that by adding a custom mir operation that allows picking an arbitrary cast. r? RalfJung

@oli-obk

…r=oli-obk Simplify diagnostic levels This PR separates diagnostic levels from subdiagnostic levels and does a few preliminary cleanups. Details in individual commits. r? @oli-obk

… r=khyperia Gate ELF code in metadata.rs for ELF only This PR gates ELF specific code for `BinaryFormat::Elf`. With this change, fallback for PowerPC64 on AIX is no longer needed. --------- Assisted-by: IBM Bob The issue was discovered by IBM Bob while checking changes for other things, and I personally verified the bug. Although the fix is trivial, I ran it through IBM Bob to make sure I wasn’t missing anything.

JonathanBrouwer · 2026-09-10T14:06:07Z

@bors r+ p=5

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

rust-bors · 2026-09-10T14:06:10Z

📌 Commit 312a653 has been approved by JonathanBrouwer

It is now in the queue for this repository.

rust-bors · 2026-09-10T14:06:18Z

⌛ Trying commit 312a653 with merge 24bc195…

To cancel the try build, run the command @bors try cancel.

Workflow: https://github.com/rust-lang/rust/actions/runs/34486865264

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

rust-log-analyzer · 2026-09-10T14:36:29Z

The job test-x86_64-gnu-llvm-21-3 failed! Check out the build log: (web) (plain enhanced) (plain)

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

diff of stdout:

15     /*
16     0#0
17     */ {
-     ($f /* 0#0 */:ident /* 0#0 */<$a /* 0#0 */:lifetime /* 0#0 */>)
-     =>
+     ($f /* 0#0 */:ident /* 0#0 */<$a /* 0#0 */:lifetime /* 0#0
+     */>) =>
20     { fn /* 0#0 */ $f /* 0#0 */<$a /* 0#0 */, 'a /* 0#0 */>() {} }
21 }
22 fn f /* 0#0 */<'a /* 0#0 */, 'a /* 0#1 */>() {}

Note: some mismatched output was normalized before being compared
-     ($f /* 2380#0 */:ident /* 1018#0 */<$a /* 2375#0 */:lifetime /* 1118#0
+     ($f /* 0#0 */:ident /* 0#0 */<$a /* 0#0 */:lifetime /* 0#0
+     */>) =>


The actual stdout differed from the expected stdout
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args hygiene/unpretty-debug-lifetimes.rs`

error: 1 errors occurred comparing output.
status: exit status: 0
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" "/checkout/tests/ui/hygiene/unpretty-debug-lifetimes.rs" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1" "--target=x86_64-unknown-linux-gnu" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/hygiene/unpretty-debug-lifetimes" "-Znext-solver=coherence" "-A" "unused" "-W" "unused_attributes" "-A" "internal_features" "-A" "incomplete_features" "-A" "unused_parens" "-A" "unused_braces" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-Zunpretty=expanded,hygiene"
--- stdout -------------------------------
//@ check-pass
//@ compile-flags: -Zunpretty=expanded,hygiene

// Regression test for lifetime hygiene annotations in -Zunpretty=expanded,hygiene
// Previously, lifetimes were missing the #N syntax context suffix.

// Don't break whenever Symbol numbering changes
//@ normalize-stdout: "\d+#" -> "0#"

#![feature /* 873#0 */(decl_macro /* 713#0 */)]
#![feature /* 873#0 */(no_core /* 1351#0 */)]
#![no_core /* 1351#0 */]

macro lifetime_hygiene
    /*
    2964#0
    */ {
    ($f /* 2380#0 */:ident /* 1018#0 */<$a /* 2375#0 */:lifetime /* 1118#0
    */>) =>
    { fn /* 12#0 */ $f /* 2380#0 */<$a /* 2375#0 */, 'a /* 2965#0 */>() {} }
}
fn f /* 2380#0 */<'a /* 2965#0 */, 'a /* 2965#1 */>() {}


/*
Expansions:
crate0::{{expn0}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Root
crate0::{{expn1}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Bang, "lifetime_hygiene")

SyntaxContexts:
#0: parent: #0, outer_mark: (crate0::{{expn0}}, Opaque)
#1: parent: #0, outer_mark: (crate0::{{expn1}}, Opaque)
*/
------------------------------------------
stderr: none

---- [ui] tests/ui/hygiene/unpretty-debug-lifetimes.rs stdout end ----

rust-log-analyzer · 2026-09-10T14:43:49Z

The job test-aarch64-gnu-llvm-21-1 failed! Check out the build log: (web) (plain enhanced) (plain)

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

diff of stdout:

15     /*
16     0#0
17     */ {
-     ($f /* 0#0 */:ident /* 0#0 */<$a /* 0#0 */:lifetime /* 0#0 */>)
-     =>
+     ($f /* 0#0 */:ident /* 0#0 */<$a /* 0#0 */:lifetime /* 0#0
+     */>) =>
20     { fn /* 0#0 */ $f /* 0#0 */<$a /* 0#0 */, 'a /* 0#0 */>() {} }
21 }
22 fn f /* 0#0 */<'a /* 0#0 */, 'a /* 0#1 */>() {}

Note: some mismatched output was normalized before being compared
-     ($f /* 2380#0 */:ident /* 1018#0 */<$a /* 2375#0 */:lifetime /* 1118#0
+     ($f /* 0#0 */:ident /* 0#0 */<$a /* 0#0 */:lifetime /* 0#0
+     */>) =>


The actual stdout differed from the expected stdout
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args hygiene/unpretty-debug-lifetimes.rs`

error: 1 errors occurred comparing output.
status: exit status: 0
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/hygiene/unpretty-debug-lifetimes.rs" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2" "--target=aarch64-unknown-linux-gnu" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/hygiene/unpretty-debug-lifetimes" "-Znext-solver=coherence" "-A" "unused" "-W" "unused_attributes" "-A" "internal_features" "-A" "incomplete_features" "-A" "unused_parens" "-A" "unused_braces" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "-Zunpretty=expanded,hygiene"
--- stdout -------------------------------
//@ check-pass
//@ compile-flags: -Zunpretty=expanded,hygiene

// Regression test for lifetime hygiene annotations in -Zunpretty=expanded,hygiene
// Previously, lifetimes were missing the #N syntax context suffix.

// Don't break whenever Symbol numbering changes
//@ normalize-stdout: "\d+#" -> "0#"

#![feature /* 873#0 */(decl_macro /* 713#0 */)]
#![feature /* 873#0 */(no_core /* 1351#0 */)]
#![no_core /* 1351#0 */]

macro lifetime_hygiene
    /*
    2964#0
    */ {
    ($f /* 2380#0 */:ident /* 1018#0 */<$a /* 2375#0 */:lifetime /* 1118#0
    */>) =>
    { fn /* 12#0 */ $f /* 2380#0 */<$a /* 2375#0 */, 'a /* 2965#0 */>() {} }
}
fn f /* 2380#0 */<'a /* 2965#0 */, 'a /* 2965#1 */>() {}


/*
Expansions:
crate0::{{expn0}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Root
crate0::{{expn1}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Bang, "lifetime_hygiene")

SyntaxContexts:
#0: parent: #0, outer_mark: (crate0::{{expn0}}, Opaque)
#1: parent: #0, outer_mark: (crate0::{{expn1}}, Opaque)
*/
------------------------------------------
stderr: none

---- [ui] tests/ui/hygiene/unpretty-debug-lifetimes.rs stdout end ----

rust-bors · 2026-09-10T15:08:36Z

PR #160860, which is a member of this rollup, was unapproved.

This rollup was thus unapproved.

JonathanBrouwer · 2026-09-10T15:09:01Z

@bors try cancel

rust-bors · 2026-09-10T15:09:05Z

Try build cancelled. Cancelled workflows:

https://github.com/rust-lang/rust/actions/runs/34486865264

Hint: if you want to run another try build, you do not need to manually cancel the previous one. Just run @bors try and bors will cancel the previous build automatically.

maxdexh and others added 17 commits August 18, 2026 11:24

Implement arbitrary casts in custom mir

a85dda1

Fix unsoundness issues in std::sys::pal::sgx::waitqueue::unsafe_list

82bc685

Implementing pinning in std::sys::pal::sgx::waitqueue::unsafe_list

994ae4e

Move std::sys::pal::sgx::waitqueue::unsafe_list to a platform-agnosti…

0246333

…c location and add more unit tests.

SGX: Abort instead of panic on randomness generation failure

8770fd6

Randomness generation failure is an abnormal circumstance that should lead to program termination. It's not reasonable to let consumers of `std` functionality catch such failures and resume from the.

SGX: don't abort on randomness failure in usercalls::wait

998113d

Gate ELF code in metadata.rs for ELF only.

1e18d10

Remove most Style variants

978c250

These are dead since the old emitter was removed in Jan 2026 (3ccabc6). Also removed: `BRIGHT_BLUE`, `Level::color`, and a couple of `level` fn parameters.

Remove Style::HeaderMsg

7f2354c

It has a single use, where it is passed in to `format_diag_messages` which then discards it. So that use can be replaced with `Style::NoStyle`.

Reduce unnecessary Cow use in error formatting

22d747d

`format_diag_messages` always constructs a `String`, so it can just return that. This simplifies various call sites.

Replace a format_diag_messages use

1e5fc29

When there's a single message, `format_diag_message` suffices.

Introduce Sublevel for errors

62c9a99

Current `Level` is used for both diagnostics and subdiagnostics. But both diagnostics and subdiagnostics only use some of the levels. This commit introduces `Sublevel` to tighten up the representation and prevent impossible combinations.

Tweak a use item

01e1453

Use the `FatalError` re-export from `rustc_errors` instead of `rustc_span`, because that's what's normally done.

Rollup merge of rust-lang#162514 - nnethercote:simplify-diag-Levels, …

3150d75

…r=oli-obk Simplify diagnostic levels This PR separates diagnostic levels from subdiagnostic levels and does a few preliminary cleanups. Details in individual commits. r? @oli-obk

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

JonathanBrouwer mentioned this pull request Sep 10, 2026

Implement arbitrary casts in custom mir #160860

Open

rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 10, 2026

JonathanBrouwer closed this Sep 10, 2026

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 10, 2026

Navigation Menu

Uh oh!

Uh oh!

Rollup of 4 pull requests - #162596

Rollup of 4 pull requests#162596
JonathanBrouwer wants to merge 17 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-uCq8vnb

JonathanBrouwer commented Sep 10, 2026

Uh oh!

JonathanBrouwer commented Sep 10, 2026

Uh oh!

rust-bors Bot commented Sep 10, 2026

Uh oh!

rust-bors Bot commented Sep 10, 2026 •

edited

Loading

Uh oh!

rust-log-analyzer commented Sep 10, 2026

Uh oh!

rust-log-analyzer commented Sep 10, 2026

Uh oh!

rust-bors Bot commented Sep 10, 2026

Uh oh!

JonathanBrouwer commented Sep 10, 2026

Uh oh!

rust-bors Bot commented Sep 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Uh oh!

Conversation

JonathanBrouwer commented Sep 10, 2026

Uh oh!

JonathanBrouwer commented Sep 10, 2026

Uh oh!

rust-bors Bot commented Sep 10, 2026

Uh oh!

rust-bors Bot commented Sep 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-log-analyzer commented Sep 10, 2026

Uh oh!

rust-log-analyzer commented Sep 10, 2026

Uh oh!

rust-bors Bot commented Sep 10, 2026

Uh oh!

JonathanBrouwer commented Sep 10, 2026

Uh oh!

rust-bors Bot commented Sep 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

rust-bors Bot commented Sep 10, 2026 •

edited

Loading