Skip to content

Rollup of 12 pull requests - #162089

Closed
JonathanBrouwer wants to merge 120 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-C05CNwv
Closed

Rollup of 12 pull requests#162089
JonathanBrouwer wants to merge 120 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-C05CNwv

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

Zalathar and others added 30 commits August 5, 2026 20:41
It turns out they should be treated as bare idents, not patterns, but only if they have no body.

Also allow macro patterns for both them and extern fns, because rustc allows that.
The git registry now takes long enough to download that the 10 minute
timeout is hit.
Since 1.97, linker warnings can be denied via rustc.
This is the first version with LLVM23.
This was added as part of the original test infrastructure at
8e161a791a89 ("Expand and refactor teting infrastructure") but there
doesn't seem to be any reason to keep this restriction; qemu should
handle the threads fine.
With LLVM 23, containing f128 abi fixes, this now works
Benchmarks are designed to run in release mode so these can be pretty
slow. Running once with `release-checked` is sufficient.
We accidentally skipped one level more than needed.
Fixes rust-lang/compiler-builtins#1271 by removing `#[aapcs_on_arm]`:
`compiler-rt` only does the equivalent on ARM soft-float targets where
the `"C"` ABI is already AAPCS.

[ add PR description to commit - Trevor ]
This updates the rust-version file to f7d782a.
Some PRs want to make use of newer features.
That also deletes the file when the process exits without being dropped; this is important especially for the proc macro server since it is killed and does not exit normally.

Linux and the BSDs unlink the file then access it via `/proc/self/fd` or `/dev/fd`; Windows has a dedicated API for that; and macOS unfortunately does not support that (the file is not removed after being unlinked, but you cannot access it anymore via `/dev/fd`, or at least that's what the AI said - I don't have a macOS machine to check).
Example
---
```rust
fn foo() {$0
    45
}
```

**Before this PR**

Assist not applicable

**After this PR**

```rust
fn foo() -> i32 {
    45
}
```
Example
---
```rust
macro_rules! identity { ($($t:tt)*) => {$($t)*}; }
identity! {
    fn foo() u$0
}
```

**Before this PR**

```rust
macro_r-> ules! identity { ($($t:tt)*) => {$($t)*}; }
identity! {
    fn foo() u32
}
```

**After this PR**

```rust
macro_rules! identity { ($($t:tt)*) => {$($t)*}; }
identity! {
    fn foo() -> u32
}
```
minor: offer 'add_return_type' after l_curly
fix: adds-arrow unmap ranges when fn inside macro
@rustbot rustbot added PG-exploit-mitigations Project group: Exploit mitigations 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. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Aug 31, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ 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-1,aarch64-apple-2,x86_64-mingw-1,i686-msvc-1,i686-msvc-2

@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

📌 Commit dca4e59 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors 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 Aug 31, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Aug 31, 2026
Rollup of 12 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-1
try-job: aarch64-apple-2
try-job: x86_64-mingw-1
try-job: i686-msvc-1
try-job: i686-msvc-2
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Aug 31, 2026
…uwer

Rollup of 12 pull requests

Successful merges:

 - #162045 (`rust-analyzer` subtree update)
 - #162077 (compiler-builtins subtree update)
 - #137720 (support `#[target_feature(enable = ...)]` on `#[naked]` functions)
 - #160534 (stabilize smart pointer map functions)
 - #160551 (mir_build: Clearly distinguish or/refutable/irrefutable patterns during match lowering)
 - #161929 (explicitly track inherent const generic args kind)
 - #162063 (Switch dist-aarch64-linux to EC2 and update dist-x86_64-linux)
 - #161937 (A series of Polonius Alpha refactors)
 - #162014 (Move more `rustdoc-html` tests using `--test` into the right folder)
 - #162051 (`rustc_feature` cleanups)
 - #162055 (remove `_{style}` recovery for diagnostic structs)
 - #162075 (Move track_caller on closures gating to attribute parsing)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job 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)

25    0: __rustc::rust_begin_unwind
26    1: core::panicking::panic_fmt
27    2: core::panicking::panic
-    3: rust_out::main::_doctest_main__home_imperio_rust_rust_tests_rustdoc_ui_doctest_doc_cfg_target_feature_rs_14_0
+    3: rust_out::main::_doctest_main__checkout_tests_rustdoc_ui_doctest_doc_cfg_target_feature_rs_14_0
29    4: rust_out::main
30    5: <fn() as core::ops::function::FnOnce<()>>::call_once
31 note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.


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 doctest/doc-cfg-target-feature.rs`

error: 1 errors occurred comparing output.
status: exit status: 101
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustdoc" "/checkout/tests/rustdoc-ui/doctest/doc-cfg-target-feature.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" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/doctest/doc-cfg-target-feature" "-Znext-solver=coherence" "-A" "internal_features" "-A" "incomplete_features" "-A" "unused_parens" "-A" "unused_braces" "-Cdebuginfo=0" "--test"
--- stdout -------------------------------

running 1 test
test /checkout/tests/rustdoc-ui/doctest/doc-cfg-target-feature.rs - foo (line 14) ... FAILED

---
stack backtrace:
   0: __rustc::rust_begin_unwind
   1: core::panicking::panic_fmt
   2: core::panicking::panic
   3: rust_out::main::_doctest_main__checkout_tests_rustdoc_ui_doctest_doc_cfg_target_feature_rs_14_0
   4: rust_out::main
   5: <fn() as core::ops::function::FnOnce<()>>::call_once
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.


---

13 oh no
14 stack backtrace:
15    0: std::panicking::begin_panic::<&str>
-    1: rust_out::main::_doctest_main__home_imperio_rust_rust_tests_rustdoc_ui_doctest_force_target_feature_rs_10_0
+    1: rust_out::main::_doctest_main__checkout_tests_rustdoc_ui_doctest_force_target_feature_rs_10_0
17    2: rust_out::main
18    3: <fn() as core::ops::function::FnOnce<()>>::call_once
19 note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.


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 doctest/force-target-feature.rs`

error: 1 errors occurred comparing output.
status: exit status: 101
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustdoc" "/checkout/tests/rustdoc-ui/doctest/force-target-feature.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" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-ui/doctest/force-target-feature" "-Znext-solver=coherence" "-A" "internal_features" "-A" "incomplete_features" "-A" "unused_parens" "-A" "unused_braces" "-Cdebuginfo=0" "--test" "-C" "target-feature=+avx"
--- stdout -------------------------------

running 1 test
test /checkout/tests/rustdoc-ui/doctest/force-target-feature.rs - SomeStruct (line 10) ... FAILED

---
thread 'main' (343237) panicked at /checkout/tests/rustdoc-ui/doctest/force-target-feature.rs:3:1:
oh no
stack backtrace:
   0: std::panicking::begin_panic::<&str>
   1: rust_out::main::_doctest_main__checkout_tests_rustdoc_ui_doctest_force_target_feature_rs_10_0
   2: rust_out::main
   3: <fn() as core::ops::function::FnOnce<()>>::call_once
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.


@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job armhf-gnu failed! Check out the build log: (web) (plain enhanced) (plain)

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

---- [ui] tests/ui/float/conv-bits-runtime-const.rs stdout ----

error: test did not exit with success! code=Some(101) so test would pass with `run-fail`
status: exit status: 101
command: RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUST_TEST_THREADS="4" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/remote-test-client" "run" "0" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/float/conv-bits-runtime-const/a"
--- stdout -------------------------------
uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/float/conv-bits-runtime-const/a", waiting for result
------------------------------------------
---

---- [ui] tests/ui/float/conv-bits-runtime-const.rs stdout end ----
---- [ui] tests/ui/float/classify-runtime-const.rs#noopt stdout ----

error in revision `noopt`: test did not exit with success! code=Some(101) so test would pass with `run-fail`
status: exit status: 101
command: RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUST_TEST_THREADS="4" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/remote-test-client" "run" "0" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/float/classify-runtime-const.noopt/a"
--- stdout -------------------------------
uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/float/classify-runtime-const.noopt/a", waiting for result
------------------------------------------
--- stderr -------------------------------

thread 'main' (6073) panicked at /checkout/tests/ui/float/classify-runtime-const.rs:97:1:
assertion `left == right` failed: f16 :: is_finite (-1.0 / black_box(0.0)) produces wrong result
  left: true
 right: false
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
------------------------------------------

---- [ui] tests/ui/float/classify-runtime-const.rs#noopt stdout end ----
---- [ui] tests/ui/float/classify-runtime-const.rs#opt stdout ----

error in revision `opt`: test did not exit with success! code=Some(101) so test would pass with `run-fail`
status: exit status: 101
command: RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUST_TEST_THREADS="4" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/remote-test-client" "run" "0" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/float/classify-runtime-const.opt/a"
--- stdout -------------------------------
uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/float/classify-runtime-const.opt/a", waiting for result
------------------------------------------
--- stderr -------------------------------

thread 'main' (6082) panicked at /checkout/tests/ui/float/classify-runtime-const.rs:97:1:
assertion `left == right` failed: f16 :: classify (black_box(0.0) / black_box(0.0)) produces wrong result
  left: Zero
 right: Nan
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
------------------------------------------

---- [ui] tests/ui/float/classify-runtime-const.rs#opt stdout end ----

@rust-bors 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 Aug 31, 2026
@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

💔 Test for e189e9b failed: CI. Failed job:

@folkertdev

Copy link
Copy Markdown
Contributor

I suspect this is #162077

@rust-bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 31, 2026
@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

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

@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 78e2794 failed: CI. Failed jobs:

@rust-bors

rust-bors Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

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

@rustbot 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 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-CI Area: Our Github Actions CI A-compiler-builtins Area: compiler-builtins (https://github.com/rust-lang/compiler-builtins) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic PG-exploit-mitigations Project group: Exploit mitigations rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.