Rollup of 5 pull requests by jhpratt · Pull Request #154353 · rust-lang/rust

jhpratt · 2026-03-25T05:59:28Z

Successful merges:

Add -Zsanitize=kernel-hwaddress #153049 (Add -Zsanitize=kernel-hwaddress)
miri recursive validation: only check one layer deep #154269 (miri recursive validation: only check one layer deep)
some tests/ui/macros cleanup #154112 (some tests/ui/macros cleanup)
begin tests/ui/structs-enums cleanup #154131 (begin tests/ui/structs-enums cleanup)
Move ui/issues tests to relevant subdirectories #154233 (Move ui/issues tests to relevant subdirectories)

Signed-off-by: Alice Ryhl <aliceryhl@google.com>

* tests(ui): migrate issues/issue-17546 to ui/resolve * tests(ui): add gh issue link * tests(ui/issues): move tests to variants dir

@rcvalle

Add `-Zsanitize=kernel-hwaddress` The Linux kernel has a config option called `CONFIG_KASAN_SW_TAGS` that enables `-fsanitize=kernel-hwaddress`. This is not supported by Rust. One slightly awkward detail is that `#[sanitize(address = "off")]` applies to both `-Zsanitize=address` and `-Zsanitize=kernel-address`. Probably it was done this way because both are the same LLVM pass. I replicated this logic here for hwaddress, but it might be undesirable. Note that `#[sanitize(kernel_hwaddress = "off")]` could be supported as an annotation on statics, but since it's also missing for `#[sanitize(hwaddress = "off")]`, I did not add it. MCP: rust-lang/compiler-team#975 Tracking issue: rust-lang#154171 cc @rcvalle @maurer @ojeda

…=saethlin miri recursive validation: only check one layer deep As has been proposed in rust-lang/unsafe-code-guidelines#414, let's see what happens if we make recursive checking in Miri shallow: we treat whatever is behind a reference as if it was inside `MaybeDangling`, which means nested references do not have to be dereferenceable. This changes the meaning of the original flag -- I don't think it is worth supporting multiple variants of recursive checking (it'd require a bunch of new plumbing), and this seems to be the strictest variant that still has any traction in the discussion.

some `tests/ui/macros` cleanup Move most tests that do not run any code from `//@ run-pass` to `//@ check-pass` and merge the (outdated) `die-macro-*` tests into one file.

begin `tests/ui/structs-enums` cleanup Nearly all tests in this directory are heavily outdated, poorly formatted and have a lot of duplication. This PR is the first of a planned series of PRs to combinine this, `ui/structs` and `ui/enum` into a better structure (`ui/adt` maybe?).

@Kivooeo

…r=Kivooeo Move ui/issues tests to relevant subdirectories Related to rust-lang#133895 and [Reorganisation of tests/ui/issues for GSOC](https://github.com/rust-lang/google-summer-of-code?tab=readme-ov-file#reorganisation-of-testsuiissues) This is the first PR in a batch of PRs. Moves `ui/issues/issue-17546.rs‎` ‎-> `ui/variants/variant-result-noresult-used-as-type.rs` Approach: 1. Check linked issue and test contents, determine new target directory 2. Move / rename tests to reflect purpose. 3. Add issue link / comments in separate commit. 4. Rebless if necessary and remove obsolete stderr. r? @Kivooeo

jhpratt · 2026-03-25T05:59:38Z

@bors r+ rollup=never p=5

rust-bors · 2026-03-25T05:59:41Z

📌 Commit 63bd8cf has been approved by jhpratt

It is now in the queue for this repository.

Rollup of 5 pull requests Successful merges: - #153049 (Add `-Zsanitize=kernel-hwaddress`) - #154269 (miri recursive validation: only check one layer deep) - #154112 (some `tests/ui/macros` cleanup) - #154131 (begin `tests/ui/structs-enums` cleanup) - #154233 (Move ui/issues tests to relevant subdirectories)

rust-log-analyzer · 2026-03-25T11:26:06Z

The job dist-x86_64-apple failed! Check out the build log: (web) (plain enhanced) (plain)

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

  --- stdout
  cargo:rerun-if-changed=imp
  Creating /Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging
  Creating /Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging/src
  Copying /Users/runner/work/rust/rust/src/tools/rust-analyzer/crates/proc-macro-srv/proc-macro-test/imp/Cargo.toml to /Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging/Cargo.toml
  Copying /Users/runner/work/rust/rust/src/tools/rust-analyzer/crates/proc-macro-srv/proc-macro-test/imp/build.rs to /Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging/build.rs
  Copying /Users/runner/work/rust/rust/src/tools/rust-analyzer/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs to /Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging/src/lib.rs
  Running cd "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging" && "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage0/bin/cargo" "build" "-p" "proc-macro-test-impl" "--message-format" "json" "--target-dir" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/target" "--target" "x86_64-apple-darwin"
  proc-macro-test-impl failed to build
  ============ stdout ============
  {"reason":"compiler-artifact","package_id":"path+file:///Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging#proc-macro-test-impl@0.0.0","manifest_path":"/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging/Cargo.toml","target":{"kind":["custom-build"],"crate_types":["bin"],"name":"build-script-build","src_path":"/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging/build.rs","edition":"2024","doc":false,"doctest":false,"test":false},"profile":{"opt_level":"0","debuginfo":2,"debug_assertions":true,"overflow_checks":true,"test":false},"features":[],"filenames":["/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/debug/build/proc-macro-test-impl-0a2e58f8016e7146/build-script-build"],"executable":null,"fresh":false}
  {"reason":"build-finished","success":false}

  ============ stderr ============
     Compiling proc-macro-test-impl v0.0.0 (/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging)
  [RUSTC-TIMING] build_script_build test:false 0.279
  error: failed to run custom build command for `proc-macro-test-impl v0.0.0 (/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/build/proc-macro-test-6601d14ecdf10331/out/proc-macro-test-imp-staging)`

rust-bors · 2026-03-25T11:26:44Z

💔 Test for b27b2eb failed: CI. Failed job:

auto - dist-x86_64-apple (web logs, enhanced plaintext logs)

JonathanBrouwer · 2026-03-25T17:10:15Z

@bors try jobs=dist-x86_64-apple
Not sure which one this would be, is it reproducable?

Rollup of 5 pull requests try-job: dist-x86_64-apple

rust-bors · 2026-03-25T19:21:35Z

☀️ Try build successful (CI)
Build commit: 56ef8da (56ef8da43619ab08345a5150eaca4c10526e90ef, parent: 64d5cb603b9caf9063d27d64fdfa61fa7af3b98f)

rust-bors · 2026-03-25T19:24:55Z

This pull request was unapproved due to being closed.

Darksonn and others added 20 commits March 17, 2026 20:23

Add kernel-hwaddress sanitizer

a197752

Signed-off-by: Alice Ryhl <aliceryhl@google.com>

Explain why __hwasan_tls is present in LLVM codegen

e41bbfa

Adjust lifetime markers comment

ec03f4e

Simplify tests and fix test tidy issue

c679e3d

move many ui/macros tests from run- to check-pass

adacd90

merge die-macro tests into panic-macro-basic.rs

9ce6863

merge many repetitive classes-* tests

ad79aa7

reformat merged files

0941e18

delete some tests that lost their meaning

0486281

merge several tuple-struct-* tests

98a1441

move many tests from run-pass to check-pass

ff524fd

miri recursive checking: only check one layer deep

5f68044

Do not check for LEAK & KERNELHWADDRESS because they are incompatible

422906d

Document kernel-hwaddress in Unstable Book

4d86840

Move ui/issues tests to relevant subdirectories

62ba3c1

* tests(ui): migrate issues/issue-17546 to ui/resolve * tests(ui): add gh issue link * tests(ui/issues): move tests to variants dir

Rollup merge of rust-lang#154112 - cyrgani:macros-folder, r=Kivooeo

b4d8062

some `tests/ui/macros` cleanup Move most tests that do not run any code from `//@ run-pass` to `//@ check-pass` and merge the (outdated) `die-macro-*` tests into one file.

rust-bors bot added the rollup A PR which is a rollup label Mar 25, 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 Mar 25, 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 Mar 25, 2026

This comment has been minimized.

Sign in to view

rust-bors bot pushed a commit that referenced this pull request Mar 25, 2026

Auto merge of #154353 - jhpratt:rollup-bLxq22n, r=<try>

56ef8da

Rollup of 5 pull requests try-job: dist-x86_64-apple

JonathanBrouwer closed this Mar 25, 2026

rust-bors bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 25, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2026

jhpratt deleted the rollup-bLxq22n branch March 25, 2026 19:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests#154353

Rollup of 5 pull requests#154353
jhpratt wants to merge 20 commits intorust-lang:mainfrom
jhpratt:rollup-bLxq22n

jhpratt commented Mar 25, 2026

Uh oh!

jhpratt commented Mar 25, 2026

Uh oh!

rust-bors bot commented Mar 25, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Mar 25, 2026

Uh oh!

rust-bors bot commented Mar 25, 2026

Uh oh!

JonathanBrouwer commented Mar 25, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 25, 2026

Uh oh!

rust-bors bot commented Mar 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Conversation

jhpratt commented Mar 25, 2026

Uh oh!

jhpratt commented Mar 25, 2026

Uh oh!

rust-bors bot commented Mar 25, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Mar 25, 2026

Uh oh!

rust-bors bot commented Mar 25, 2026

Uh oh!

JonathanBrouwer commented Mar 25, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 25, 2026

Uh oh!

rust-bors bot commented Mar 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants