Rollup of 24 pull requests by JonathanBrouwer · Pull Request #159957 · rust-lang/rust

JonathanBrouwer · 2026-07-26T10:02:26Z

Successful merges:

bootstrap: Split the Step trait into multiple traits #159638 (bootstrap: Split the Step trait into multiple traits)
rustc_trait_selection: fix trait solver hang caused by degenerate obligations #159774 (rustc_trait_selection: fix trait solver hang caused by degenerate obligations)
line-tables-only test: check that the line number matches the function name #159837 (line-tables-only test: check that the line number matches the function name)
Update Enzyme submodule to imporve llvm-cov #159946 (Update Enzyme submodule to imporve llvm-cov)
Fix up #[linkage] target checking #159617 (Fix up #[linkage] target checking)
std: Switch implementations of thread_local! for WASI #159733 (std: Switch implementations of thread_local! for WASI)
Check unsafe impls on safe EIIs #159783 (Check unsafe impls on safe EIIs)
Add tuple never coercion collection regression test #159810 (Add tuple never coercion collection regression test)
Update expect message in binary_heap and vec_deque module #159821 (Update expect message using the recommended style in binary_heap module)
Remove redundant #[rustc_paren_sugar] feature gate #159826 (Remove redundant #[rustc_paren_sugar] feature gate)
Implement str::copy_from_str #159846 (Implement str::copy_from_str)
rustc_parse: Stop returning Option from statement parsing #159849 (rustc_parse: Stop returning Option from statement parsing)
Updated expect messages in library/alloc/src/ffi/c_str.rs to follow the style guide #159853 (Updated expect messages for CString struct and method documentation)
More cleanup in rustc_attr_parsing #159875 (More cleanup in rustc_attr_parsing)
Update expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide #159882 (Update expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide)
Split multiline derives into std/rustc macros #159891 (Split multiline derives into std/rustc macros)
Fix find_attr hygiene and rustc_hir cleanups #159893 (Fix find_attr hygiene and rustc_hir cleanups)
rustc-dev-guide subtree update #159895 (rustc-dev-guide subtree update)
Clarify that the expected runtime symbols signature is for the current target only #159902 (Clarify that the expected runtime symbols signature is for the current target only)
Fix error in diagnostic on_unmatched_args #159914 (Fix error in diagnostic on_unmatched_args)
spare capacity mut constification #159917 (spare capacity mut constification)
rename abort_unwind → abort_on_unwind #159918 (rename abort_unwind → abort_on_unwind)
Minor rustc_ast::ast doc cleanups #159936 (Minor rustc_ast::ast doc cleanups)
Update expect messages in library/core/src/ptr/non_null.rs #159945 (Update expect messages in library/core/src/ptr/non_null.rs)

This commit is a change for all WASI targets to use a different underlying implementation in the standard library for `thread_local!`. Previously all wasm targets, without the `atomics` feature, were funneled into the `no_threads` implementation and various fallbacks in the `thread_local` module. The upcoming `wasm32-wasip3` target, however, will actually have threads and will need different treatment. Additionally the modules that `wasm32-wasip3` needs all already work on all other WASI targets as well -- for example the `pthread_*` symbols needed to manage destructors are exposed by `wasi-libc`. The end result is that the `wasm32-wasip3` target will be "ready for threads" as soon as `wasi-libc` has support. Other targets shouldn't have any functional difference from before, too.

…ring.rs to follow the style guide

This updates the rust-version file to da86f4d.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@da86f4d Filtered ref: rust-lang/rustc-dev-guide@af919e8 Upstream diff: rust-lang/rust@390279b...da86f4d This merge was created using https://github.com/rust-lang/josh-sync.

Add warning for breakage hazard for introducing new builtin attrs

JonathanBrouwer · 2026-07-26T10:02:38Z

@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-*

rust-bors · 2026-07-26T10:02:46Z

📌 Commit be867b8 has been approved by JonathanBrouwer

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

Reason for tree closure: spurious failures

Rollup of 24 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-*

JonathanBrouwer · 2026-07-26T10:03:06Z

@bors p=100

rust-bors · 2026-07-26T10:40:06Z

⌛ Testing commit be867b8 with merge 2cf8b23...

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

…uwer Rollup of 24 pull requests Successful merges: - #159638 (bootstrap: Split the `Step` trait into multiple traits) - #159774 (rustc_trait_selection: fix trait solver hang caused by degenerate obligations) - #159837 (line-tables-only test: check that the line number matches the function name) - #159946 (Update Enzyme submodule to imporve llvm-cov) - #159617 (Fix up `#[linkage]` target checking) - #159733 (std: Switch implementations of `thread_local!` for WASI) - #159783 (Check unsafe impls on safe EIIs) - #159810 (Add tuple never coercion collection regression test) - #159821 (Update expect message using the recommended style in binary_heap module) - #159826 (Remove redundant `#[rustc_paren_sugar]` feature gate) - #159846 (Implement `str::copy_from_str`) - #159849 (rustc_parse: Stop returning `Option` from statement parsing) - #159853 (Updated expect messages for `CString` struct and method documentation) - #159875 (More cleanup in `rustc_attr_parsing`) - #159882 (Update expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide) - #159891 (Split multiline derives into std/rustc macros) - #159893 (Fix `find_attr` hygiene and `rustc_hir` cleanups) - #159895 (rustc-dev-guide subtree update) - #159902 (Clarify that the expected runtime symbols signature is for the current target only) - #159914 (Fix error in diagnostic on_unmatched_args) - #159917 (spare capacity mut constification) - #159918 (rename abort_unwind → abort_on_unwind) - #159936 (Minor `rustc_ast::ast` doc cleanups) - #159945 (Update expect messages in library/core/src/ptr/non_null.rs)

JonathanBrouwer · 2026-07-26T10:41:04Z

@bors yield

rust-bors · 2026-07-26T10:41:08Z

Auto build was cancelled. Cancelled workflows:

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

The next pull request likely to be tested is #158298.

rust-bors · 2026-07-26T10:47:25Z

⌛ Testing commit be867b8 with merge 498038a...

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

…uwer Rollup of 24 pull requests Successful merges: - #159638 (bootstrap: Split the `Step` trait into multiple traits) - #159774 (rustc_trait_selection: fix trait solver hang caused by degenerate obligations) - #159837 (line-tables-only test: check that the line number matches the function name) - #159946 (Update Enzyme submodule to imporve llvm-cov) - #159617 (Fix up `#[linkage]` target checking) - #159733 (std: Switch implementations of `thread_local!` for WASI) - #159783 (Check unsafe impls on safe EIIs) - #159810 (Add tuple never coercion collection regression test) - #159821 (Update expect message using the recommended style in binary_heap module) - #159826 (Remove redundant `#[rustc_paren_sugar]` feature gate) - #159846 (Implement `str::copy_from_str`) - #159849 (rustc_parse: Stop returning `Option` from statement parsing) - #159853 (Updated expect messages for `CString` struct and method documentation) - #159875 (More cleanup in `rustc_attr_parsing`) - #159882 (Update expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide) - #159891 (Split multiline derives into std/rustc macros) - #159893 (Fix `find_attr` hygiene and `rustc_hir` cleanups) - #159895 (rustc-dev-guide subtree update) - #159902 (Clarify that the expected runtime symbols signature is for the current target only) - #159914 (Fix error in diagnostic on_unmatched_args) - #159917 (spare capacity mut constification) - #159918 (rename abort_unwind → abort_on_unwind) - #159936 (Minor `rustc_ast::ast` doc cleanups) - #159945 (Update expect messages in library/core/src/ptr/non_null.rs)

rust-log-analyzer · 2026-07-26T13:09:25Z

The job optional-x86_64-gnu-parallel-frontend 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 stderr:

20 LL | |     Self::Item: Baz,
21    | |____________________^
22    = note: ...which again requires coherence checking all impls of trait `Foo`, completing the cycle
- note: cycle used when checking that `<impl at $DIR/next-solver-region-resolution.rs:12:1: 14:20>` is well-formed
-   --> $DIR/next-solver-region-resolution.rs:12:1
+ note: cycle used when checking that `<impl at $DIR/next-solver-region-resolution.rs:18:1: 20:21>` is well-formed
+   --> $DIR/next-solver-region-resolution.rs:18:1
25    |
- LL | / impl<'a, T> Foo for &'a T
+ LL | / impl<'a, T> Foo for &T
27 LL | | where
- LL | |     Self::Item: 'a,
-    | |___________________^
+ LL | |     Self::Item: Baz,
+    | |____________________^
30    = note: for more information, see <https://rustc-dev-guide.rust-lang.org/overview.html#queries> and <https://rustc-dev-guide.rust-lang.org/query.html>
31 
32 error: aborting due to 1 previous error

Note: some mismatched output was normalized before being compared
- note: cycle used when checking that `<impl at /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1: 20:21>` is well-formed
-   --> /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1
+ note: cycle used when checking that `<impl at $DIR/next-solver-region-resolution.rs:18:1: 20:21>` is well-formed
+   --> $DIR/next-solver-region-resolution.rs:18:1
+ LL | / impl<'a, T> Foo for &T
+ LL | |     Self::Item: Baz,
+    | |____________________^

Compare output by lines enabled, diff by lines:
Expected contains these lines that are not in actual:
   | |___________________^
  --> $DIR/next-solver-region-resolution.rs:12:1
LL | / impl<'a, T> Foo for &'a T
LL | |     Self::Item: 'a,
note: cycle used when checking that `<impl at $DIR/next-solver-region-resolution.rs:12:1: 14:20>` is well-formed
Actual contains these lines that are not in expected:
   | |____________________^
  --> $DIR/next-solver-region-resolution.rs:18:1
LL | / impl<'a, T> Foo for &T
LL | |     Self::Item: Baz,
note: cycle used when checking that `<impl at $DIR/next-solver-region-resolution.rs:18:1: 20:21>` is well-formed

The actual stderr differed from the expected stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args specialization/min_specialization/next-solver-region-resolution.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs" "-Zthreads=1" "-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/stage2" "--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" "-Zthreads=4" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/specialization/min_specialization/next-solver-region-resolution" "-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" "-Znext-solver=globally"
stdout: none
--- stderr -------------------------------
error[E0391]: cycle detected when coherence checking all impls of trait `Foo`
##[error]  --> /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:6:1
   |
LL | trait Foo { //~ ERROR cycle detected when coherence checking all impls of trait `Foo`
   | ^^^^^^^^^
   |
   = note: ...which requires building specialization graph of trait `Foo`...
note: ...which requires computing whether impls specialize one another...
  --> /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:12:1
   |
LL | / impl<'a, T> Foo for &'a T
LL | | where
LL | |     Self::Item: 'a,
   | |___________________^
note: ...which requires computing normalized predicates of `<impl at /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1: 20:21>`...
  --> /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1
   |
LL | / impl<'a, T> Foo for &T
LL | | where
LL | |     Self::Item: Baz,
   | |____________________^
   = note: ...which again requires coherence checking all impls of trait `Foo`, completing the cycle
note: cycle used when checking that `<impl at /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1: 20:21>` is well-formed
  --> /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1
   |
LL | / impl<'a, T> Foo for &T
LL | | where
LL | |     Self::Item: Baz,
   | |____________________^
   = note: for more information, see <https://rustc-dev-guide.rust-lang.org/overview.html#queries> and <https://rustc-dev-guide.rust-lang.org/query.html>

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0391`.
------------------------------------------

rust-bors · 2026-07-26T13:20:10Z

☀️ Try build successful (CI)
Build commit: 21af6ae (21af6ae50dd2124b3d0066057c577f1eaea29992)
Base parent: fdbd8ee (fdbd8ee70d9b68d98be873e1095d74cf9441f0c8)

rust-bors · 2026-07-26T13:24:29Z

PR #159821, which is a member of this rollup, changed its commit SHA.

This rollup was thus unapproved due to being closed.

Auto build was cancelled due to push. Cancelled workflows:

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

alexcrichton and others added 30 commits July 22, 2026 10:10

Add tuple never coercion collection regression test

1bd4fa0

Update expect message using the recommended style in binary_heap module

82b5964

Check unsafe impls on safe EIIs

bae7e21

Remove redundant #[rustc_paren_sugar] feature gate

4bd52e9

rustc_parse: Stop returning Option from statement parsing

75529d4

Updated expect messages for CString struct and method documentation

a32fa44

Update expect messages in library/alloc/boxed.rs and library/alloc/st…

36ef11a

…ring.rs to follow the style guide

sembr src/variance.md

05bb184

Prepare for merging from rust-lang/rust

5d19c92

This updates the rust-version file to da86f4d.

Split multiline derives into std/rustc macros

acb9407

improve variance.md

d57ee22

Add warning for breakage hazard for introducing new builtin attrs

4196283

Merge pull request rust-lang#2944 from jieyouxu/builtin_attr

d44d12d

Add warning for breakage hazard for introducing new builtin attrs

sembr src/rustdoc-internals/rustdoc-gui-test-suite.md

f36f2b9

overlong

0d9c6a4

punctuation

c565998

sembr src/rustdoc-internals/search.md

54c2643

Fix find_attr hygiene issues

3aecf93

typo

71f1401

sembr src/stability-guarantees.md

19ec811

sembr src/pat-exhaustive-checking.md

2500a68

remove extern crate self as rustc_hir; statement

beddeb0

improve pat-exhaustive-checking.md

72da0f5

sembr src/ast-validation.md

a477499

sembr src/notification-groups/gpu-target.md

8da4c50

improve notification-groups/gpu-target.md

a88b4f0

sembr src/notification-groups/wasm.md

be78fc8

select the right text to link

01f3867

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 Jul 26, 2026

This comment has been minimized.

Sign in to view

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 Jul 26, 2026

rust-bors Bot closed this Jul 26, 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 Jul 26, 2026

rust-bors Bot mentioned this pull request Jul 26, 2026

Update expect message in binary_heap and vec_deque module #159821

Merged

JonathanBrouwer deleted the rollup-umqL0sB branch August 21, 2026 08:31

Navigation Menu

Uh oh!

Uh oh!

Rollup of 24 pull requests - #159957

Rollup of 24 pull requests#159957
JonathanBrouwer wants to merge 85 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-umqL0sB

JonathanBrouwer commented Jul 26, 2026

Uh oh!

JonathanBrouwer commented Jul 26, 2026

Uh oh!

rust-bors Bot commented Jul 26, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Jul 26, 2026

Uh oh!

rust-bors Bot commented Jul 26, 2026 •

edited

Loading

Uh oh!

JonathanBrouwer commented Jul 26, 2026

Uh oh!

rust-bors Bot commented Jul 26, 2026

Uh oh!

rust-bors Bot commented Jul 26, 2026 •

edited

Loading

Uh oh!

rust-log-analyzer commented Jul 26, 2026

Uh oh!

rust-bors Bot commented Jul 26, 2026

Uh oh!

rust-bors Bot commented Jul 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

Uh oh!

Uh oh!

Conversation

JonathanBrouwer commented Jul 26, 2026

Uh oh!

JonathanBrouwer commented Jul 26, 2026

Uh oh!

rust-bors Bot commented Jul 26, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Jul 26, 2026

Uh oh!

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

Uh oh!

Uh oh!

JonathanBrouwer commented Jul 26, 2026

Uh oh!

rust-bors Bot commented Jul 26, 2026

Uh oh!

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

Uh oh!

Uh oh!

rust-log-analyzer commented Jul 26, 2026

Uh oh!

rust-bors Bot commented Jul 26, 2026

Uh oh!

rust-bors Bot commented Jul 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

rust-bors Bot commented Jul 26, 2026 •

edited

Loading

rust-bors Bot commented Jul 26, 2026 •

edited

Loading