Rollup of 15 pull requests by JonathanBrouwer · Pull Request #163175 · rust-lang/rust

JonathanBrouwer · 2026-09-22T19:38:12Z

Successful merges:

Update deprecated rustc_hir imports #163170 (Update deprecated rustc_hir imports)
Detect missing else in let statement #156949 (Detect missing else in let statement)
stabilize Box::take #160436 (stabilize Box::take)
macro_metavar_expr_concat: support concatenating into string literals #160570 (macro_metavar_expr_concat: support concatenating into string literals)
Avoid ICEs when recovering malformed function parameters #162498 (Avoid ICEs when recovering malformed function parameters)
Dedicated Display type for CStr::display #162837 (Dedicated Display type for CStr::display)
Use wrapping arithmetic in from_str_radix #163099 (Use wrapping arithmetic in from_str_radix)
Tiny cleanups to deferred liveness #163166 (Tiny cleanups to deferred liveness)
Add f16 inline ASM support for nvptx64-nvidia-cuda #161667 (Add f16 inline ASM support for nvptx64-nvidia-cuda)
Restore Send and Sync for BorrowedCursor #163063 (Restore Send and Sync for BorrowedCursor)
OpenBSD/sparc64 has switched from GCC to Clang #163097 (OpenBSD/sparc64 has switched from GCC to Clang)
Skip redundant storage-conflict updates during coroutine layout #163126 (Skip redundant storage-conflict updates during coroutine layout)
librustdoc: remove stale dep on base64 #163135 (librustdoc: remove stale dep on base64)
tests: Update f16b codegen test for LoongArch and RISC-V #163146 (tests: Update f16b codegen test for LoongArch and RISC-V)
treat inductive cycles as ambig #163159 (treat inductive cycles as ambig)

Warning

This rollup conflicts with pending auto build #163165 and may need to be recreated if the pending build succeeds.

This appears to have become unused in August 2025. I noticed today because of trying to consolidate versions of things in the toolchain.

simplify liveness sources to not need a lifetime or a location map

- tiny renamings - tiny type simplifications (type ascription, closure return type) - fixing a comment

and group it with related code

Add target-specific revisions to the `f16b` codegen test to account for LoongArch and RISC-V lowering `f16b` to LLVM `half` rather than `bfloat`.

Update deprecated rustc_hir imports Followup to rust-lang#160336 That's ~half of them, I'm not doing it all in one go to reduce conflicts.

Detect missing else in let statement Fixes rust-lang#135857 I add the help message in rustc_resolve. It now will display something like this: ```rust error: expected identifier, found keyword `return` --> ./test.rs:8:24 | 8 | let Some(a) = bar{return;}; | --- ^^^^^^ expected identifier, found keyword | | | while parsing this struct | help: escape `return` to use it as an identifier | 8 | let Some(a) = bar{r#return;}; | ++ error[E0574]: expected struct, variant or union type, found local variable `bar` --> ./test.rs:8:20 | 8 | let Some(a) = bar{return;}; | ^^^ not a struct, variant or union type | help: try adding `else` here: | 8 | let Some(a) = bar else {return;}; | ++++ error: aborting due to 2 previous errors For more information about this error, try `rustc --explain E0574`. ``` r? estebank

…kertdev OpenBSD/sparc64 has switched from GCC to Clang

…=oli-obk Skip redundant storage-conflict updates during coroutine layout ## Summary When computing coroutine storage conflicts, we currently record conflicts between every pair in the live set. This PR instead remembers the last live set whose conflicts were recorded; if the current set is a subset, we skip the matrix updates. For example, after recording `{a, b, c}`, observing `{a, b}` adds no new conflicts. I used an LLM to profile this change, and saw a compiler CPU reduction in the following projects: - Codex: 2.69% - Ruff: 2.84% - uv: 5.28% - ty: 3.28%

librustdoc: remove stale dep on base64 This appears to have become unused in August 2025. I noticed today because of trying to consolidate versions of things in the toolchain.

tests: Update `f16b` codegen test for LoongArch and RISC-V Fixes rust-lang#163145

…-obk treat inductive cycles as ambig We needed inductive cycles to be `NoSolution` for proper `ParamEnv` normalization. With rust-lang#158643 this is no longer necessary, so lets make the stabilization of the new solver as small as possible. r? types

JonathanBrouwer · 2026-09-22T19:38:28Z

@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-22T19:38:31Z

📌 Commit 37c2f01 has been approved by JonathanBrouwer

It is now in the queue for this repository.

rust-bors · 2026-09-22T19:38:38Z

⌛ Trying commit 37c2f01 with merge d1cf565…

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

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

Rollup of 15 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-22T20:07:15Z

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)

test [crashes] tests/crashes/155761-1.rs ... ok
test [crashes] tests/crashes/158243.rs ... ok
test [crashes] tests/crashes/160329.rs ... ok
test [crashes] tests/crashes/158797.rs ... ok
2026-09-22T20:07:02.193487Z ERROR compiletest::runtest: fatal error, panic: "crashtest no longer crashes/triggers ICE, hooray! Please give it a meaningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit. Adding 'Fixes #<issueNr>' to your PR description ensures that the corresponding ticket is auto-closed upon merge. If you want to see verbose output, set `COMPILETEST_VERBOSE_CRASHES=1`."
test [crashes] tests/crashes/158773.rs ... ok
test [crashes] tests/crashes/160490.rs ... FAILED
test [crashes] tests/crashes/87577.rs ... ok
test [crashes] tests/crashes/88296.rs ... ok
test [crashes] tests/crashes/34127.rs ... ok
---

---- [crashes] tests/crashes/160490.rs stdout ----
------rustc stdout------------------------------

------rustc stderr------------------------------
error: unexpected `...`
##[error] --> /checkout/tests/crashes/160490.rs:2:6
  |
2 | fn f(...: u8) {}
  |      ^^^ not a valid pattern
  |
help: for a rest pattern, use `..` instead of `...`
---
  |      ^^^
  |
  = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
  = note: for more information, see issue #145544 <https://github.com/rust-lang/rust/issues/145544>
  = note: `#[deny(varargs_without_pattern)]` (part of `#[deny(future_incompatible)]`) on by default
help: name the argument, or use `_` to continue ignoring it
  |
2 | fn f(_: ...: u8) {}
  |      ++

error[E0601]: `main` function not found in crate `160490`
##[error] --> /checkout/tests/crashes/160490.rs:2:17
  |
---
For more information about this error, try `rustc --explain E0601`.

------------------------------------------

error: crashtest no longer crashes/triggers ICE, hooray! Please give it a meaningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit. Adding 'Fixes #<issueNr>' to your PR description ensures that the corresponding ticket is auto-closed upon merge. If you want to see verbose output, set `COMPILETEST_VERBOSE_CRASHES=1`.

thread '[crashes] tests/crashes/160490.rs' panicked at src/tools/compiletest/src/runtest/crashes.rs:16:18:
fatal error
stack backtrace:
   5: __rustc::rust_begin_unwind

rust-bors · 2026-09-22T20:18:25Z

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

This rollup was thus unapproved.

rust-log-analyzer · 2026-09-22T20:18:30Z

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)

test [crashes] tests/crashes/157197.rs ... ok
test [crashes] tests/crashes/160329.rs ... ok
test [crashes] tests/crashes/158797.rs ... ok
test [crashes] tests/crashes/158773.rs ... ok
2026-09-22T20:18:15.339460Z ERROR compiletest::runtest: fatal error, panic: "crashtest no longer crashes/triggers ICE, hooray! Please give it a meaningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit. Adding 'Fixes #<issueNr>' to your PR description ensures that the corresponding ticket is auto-closed upon merge. If you want to see verbose output, set `COMPILETEST_VERBOSE_CRASHES=1`."
test [crashes] tests/crashes/160490.rs ... FAILED
test [crashes] tests/crashes/88296.rs ... ok
test [crashes] tests/crashes/87577.rs ... ok
test [crashes] tests/crashes/34127.rs ... ok
test [crashes] tests/crashes/54888.rs ... ok
---

---- [crashes] tests/crashes/160490.rs stdout ----
------rustc stdout------------------------------

------rustc stderr------------------------------
error: unexpected `...`
##[error] --> /checkout/tests/crashes/160490.rs:2:6
  |
2 | fn f(...: u8) {}
  |      ^^^ not a valid pattern
  |
help: for a rest pattern, use `..` instead of `...`
---
  |      ^^^
  |
  = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
  = note: for more information, see issue #145544 <https://github.com/rust-lang/rust/issues/145544>
  = note: `#[deny(varargs_without_pattern)]` (part of `#[deny(future_incompatible)]`) on by default
help: name the argument, or use `_` to continue ignoring it
  |
2 | fn f(_: ...: u8) {}
  |      ++

error[E0601]: `main` function not found in crate `160490`
##[error] --> /checkout/tests/crashes/160490.rs:2:17
  |
---
For more information about this error, try `rustc --explain E0601`.

------------------------------------------

error: crashtest no longer crashes/triggers ICE, hooray! Please give it a meaningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit. Adding 'Fixes #<issueNr>' to your PR description ensures that the corresponding ticket is auto-closed upon merge. If you want to see verbose output, set `COMPILETEST_VERBOSE_CRASHES=1`.

thread '[crashes] tests/crashes/160490.rs' panicked at src/tools/compiletest/src/runtest/crashes.rs:16:18:
fatal error
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
---- [crashes] tests/crashes/160490.rs stdout end ----

JonathanBrouwer · 2026-09-22T20:18:55Z

@bors try cancel

rust-bors · 2026-09-22T20:18:59Z

Try build cancelled. Cancelled workflows:

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

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.

edwloef and others added 30 commits August 3, 2026 15:05

stabilize Box::take

c918352

Dedicated Display type for CStr::display

71ef655

Restore Send and Sync for BorrowedCursor

428aeee

OpenBSD/sparc64 has switched from GCC to Clang

c176c10

Skip redundant storage-conflict updates during coroutine layout

1403737

librustdoc: remove stale dep on base64

240e41a

This appears to have become unused in August 2025. I noticed today because of trying to consolidate versions of things in the toolchain.

we have the location_map at home

2269cba

simplify liveness sources to not need a lifetime or a location map

fix typo

acabd50

assorted cleanups in LivenessComputation::compute

87e35b5

- tiny renamings - tiny type simplifications (type ascription, closure return type) - fixing a comment

expand comment to match callback signature

38ca3d3

move LivenessSource to liveness module

4a461d0

and group it with related code

remove unneeded BorrowckInferCtxt from defer_local

ec908e6

remove pre-existing link that doesn't work

1d76d15

fix issue-156949

0875187

fix

f9276f4

changed to parser

355aec9

treat inductive cycles as ambig

622fd6a

Add f16 inline ASM support for nvptx64-nvidia-cuda

baf4778

clarify some names in record_legacy_polonius_drop_facts

3438e6f

remove unneeded type ascription

d72a519

remove allocation to create the local use map

6241eb0

add comment

9a3ab65

macro_metavar_expr_concat: support concatenating into string literals

6c0f3aa

avoid ICEs when recovering malformed function parameters

fc83fc8

tests: Update f16b codegen test for LoongArch and RISC-V

41ae947

Add target-specific revisions to the `f16b` codegen test to account for LoongArch and RISC-V lowering `f16b` to LLVM `half` rather than `bfloat`.

Document coroutine storage-conflict fast path

501b40c

Update deprecated rustc_hir imports

3c7c76c

Use wrapping arithmetic in from_str_radix

84a341b

Rollup merge of rust-lang#163170 - mejrs:hir_imports, r=oli-obk

9ba8cc9

Update deprecated rustc_hir imports Followup to rust-lang#160336 That's ~half of them, I'm not doing it all in one go to reduce conflicts.

JonathanBrouwer added 5 commits September 22, 2026 21:38

Rollup merge of rust-lang#163097 - brad0:librustc_llvm_sparc64, r=fol…

9cab8b1

…kertdev OpenBSD/sparc64 has switched from GCC to Clang

Rollup merge of rust-lang#163135 - durin42:base64-upgrade, r=Urgau

a6a3acf

librustdoc: remove stale dep on base64 This appears to have become unused in August 2025. I noticed today because of trying to consolidate versions of things in the toolchain.

Rollup merge of rust-lang#163146 - heiher:ignore-f16b-la-rv, r=lqd

03acbd7

tests: Update `f16b` codegen test for LoongArch and RISC-V Fixes rust-lang#163145

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

JonathanBrouwer mentioned this pull request Sep 22, 2026

Avoid ICEs when recovering malformed function parameters #162498

Merged

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 Sep 22, 2026

rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 22, 2026

JonathanBrouwer closed this Sep 22, 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 22, 2026

Navigation Menu

Uh oh!

Rollup of 15 pull requests - #163175

Rollup of 15 pull requests#163175
JonathanBrouwer wants to merge 43 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-e4GWzm6

JonathanBrouwer commented Sep 22, 2026

Uh oh!

JonathanBrouwer commented Sep 22, 2026

Uh oh!

rust-bors Bot commented Sep 22, 2026

Uh oh!

rust-bors Bot commented Sep 22, 2026 •

edited

Loading

Uh oh!

rust-log-analyzer commented Sep 22, 2026

Uh oh!

rust-bors Bot commented Sep 22, 2026

Uh oh!

rust-log-analyzer commented Sep 22, 2026

Uh oh!

JonathanBrouwer commented Sep 22, 2026

Uh oh!

rust-bors Bot commented Sep 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

Uh oh!

Conversation

JonathanBrouwer commented Sep 22, 2026

Uh oh!

JonathanBrouwer commented Sep 22, 2026

Uh oh!

rust-bors Bot commented Sep 22, 2026

Uh oh!

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

Uh oh!

Uh oh!

rust-log-analyzer commented Sep 22, 2026

Uh oh!

rust-bors Bot commented Sep 22, 2026

Uh oh!

rust-log-analyzer commented Sep 22, 2026

Uh oh!

JonathanBrouwer commented Sep 22, 2026

Uh oh!

rust-bors Bot commented Sep 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

rust-bors Bot commented Sep 22, 2026 •

edited

Loading