Skip to content

Rollup of 14 pull requests#158578

Closed
JonathanBrouwer wants to merge 53 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-wnMhvZt
Closed

Rollup of 14 pull requests#158578
JonathanBrouwer wants to merge 53 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-wnMhvZt

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

Rohan-Singla and others added 30 commits June 18, 2026 15:23
…pported (windows, unix, uefi, etc.); modified the Unix implementation to use fchmodat instead of open + fchmod; clarified documentations for set_permissions_nofollow; added a test case for set_permissions_nofollow
Co-authored-by: Daniil Kovalev <dkovalev@accesssoftek.com>
Allow PAC metadata to be passed to `get_fn_addr` and related API
changes.
The set of supported attributes is:
function
* "aarch64-jump-table-hardening"
* "ptrauth-auth-traps"
* "ptrauth-calls"
* "ptrauth-indirect-gotos"
* "ptrauth-returns"
module
* "ptrauth-elf-got"
* "ptrauth-sign-personality"
Also:
* update tests to force dynamic library when targetting pauthtest
* various test fixes
* introduce end-to-end tests for pauthtest (in run-make)
Currently, rustc can emit a FatalError diagnostic during parsing of
literals and tokenstreams. These are handled under the hood as a panic,
which means that proc-macro code needed to catch_unwind if it wanted to
fallibly parse some code. These still emit diagnostics, so in practice
this isn't a full fix, but it at least makes the interface on the macro
side a bit more uniform.

This is primarily motivated by wasm proc macros which can't use
catch_unwind and so this lets the test's output be the same with and
without them.
* refactor: move attribute and keywords docs files to core
* fix references to `std`
* tidy fixes
* ignore doc tests w/ explicit_tail_calls
* revert `unsafe` example and ignore specifically WASM for `become` doc tests
* add explicit note about doube including the docs in `core` and `std`
* missed refactoring of doc test ignore
* conditionally exclude doc-test containing threading for `wasm-wasip1`
* Change exclusion to just `wasi` target_os

Co-authored-by: Justin Schilleman <97192655+jschillem@users.noreply.github.com>
@rustbot rustbot added A-CI Area: Our Github Actions CI A-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend A-test-infra-minicore Area: `minicore` test auxiliary and `//@ add-core-stubs` A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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-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 Jun 29, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never

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-2

@rust-bors

rust-bors Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 4a9819f has been approved by JonathanBrouwer

It is now in the queue for this repository.

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

@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 Jun 29, 2026
@rust-bors

rust-bors Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

⌛ Trying commit 4a9819f with merge c5a9fba

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

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

rust-bors Bot pushed a commit that referenced this pull request Jun 29, 2026
Rollup of 14 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-2
@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)
test [ui] tests/ui/static/static-struct-initialization-5688.rs ... ok
test [ui] tests/ui/static/static_sized_requirement.rs ... ok
test [ui] tests/ui/statics/check-values-constraints.rs ... ok
test [ui] tests/ui/statics/conditional-static-declaration-16010.rs ... ok
test [ui] tests/ui/statics/crt-static-pauthtest.rs ... ignored, only executed when the ABI is pauthtest
test [ui] tests/ui/statics/const_generics.rs#noopt ... ok
test [ui] tests/ui/statics/check-recursion-foreign.rs ... ok
test [ui] tests/ui/statics/const_generics.rs#opt ... ok
test [ui] tests/ui/statics/issue-14227.rs ... ok
test [ui] tests/ui/statics/enum-with-static-str-variant-13214.rs ... ok
---
test [crashes] tests/crashes/148630.rs ... ok
test [crashes] tests/crashes/148890.rs ... ok
test [crashes] tests/crashes/149162.rs ... ok
test [crashes] tests/crashes/149703.rs ... ok
2026-06-29T19:10:36.451262Z 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/148891.rs ... FAILED
test [crashes] tests/crashes/149809.rs ... ok
test [crashes] tests/crashes/150040.rs ... ok
test [crashes] tests/crashes/150049.rs ... ok
test [crashes] tests/crashes/150128.rs ... ok
---

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

------rustc stderr------------------------------
error: expected expression, found `ty` metavariable
##[error]  --> /checkout/tests/crashes/148891.rs:7:26
   |
 5 |         pub enum TokenKind {
   |                  --------- while parsing this enum
 6 |             #[cfg(test)]
 7 |             STRING ([u8; $inner]),
   |                          ^^^^^^ expected expression
...
12 | values!(String);
   | --------------- in this macro invocation
   |
   = help: enum variants can be `Variant`, `Variant = <integer>`, `Variant(Type, ..., TypeN)` or `Variant { fields: Types }`
   = note: this error originates in the macro `values` (in Nightly builds, run with -Z macro-backtrace for more info)

error: macro expansion ignores `)` and any tokens following
##[error]  --> /checkout/tests/crashes/148891.rs:7:33
   |
 7 |             STRING ([u8; $inner]),
   |                                 ^
...
12 | values!(String);
   | --------------- caused by the macro expansion here
   |
   = note: the usage of `values!` is likely invalid in item context

error: aborting due to 2 previous errors


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

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/148891.rs' panicked at src/tools/compiletest/src/runtest/crashes.rs:16:18:
fatal error
stack backtrace:
   5: __rustc::rust_begin_unwind

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job 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 [ui] tests/ui/static/static-struct-initialization-5688.rs ... ok
test [ui] tests/ui/static/static_sized_requirement.rs ... ok
test [ui] tests/ui/statics/check-values-constraints.rs ... ok
test [ui] tests/ui/statics/check-recursion-foreign.rs ... ok
test [ui] tests/ui/statics/crt-static-pauthtest.rs ... ignored, only executed when the ABI is pauthtest
test [ui] tests/ui/statics/conditional-static-declaration-16010.rs ... ok
test [ui] tests/ui/statics/const_generics.rs#noopt ... ok
test [ui] tests/ui/statics/issue-14227.rs ... ok
test [ui] tests/ui/statics/const_generics.rs#opt ... ok
test [ui] tests/ui/statics/enum-with-static-str-variant-13214.rs ... ok
---
test [crashes] tests/crashes/148511.rs ... ok
test [crashes] tests/crashes/148890.rs ... ok
test [crashes] tests/crashes/148630.rs ... ok
test [crashes] tests/crashes/148632.rs ... ok
2026-06-29T19:16:51.176232Z 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/149162.rs ... ok
test [crashes] tests/crashes/149703.rs ... ok
test [crashes] tests/crashes/148891.rs ... FAILED
test [crashes] tests/crashes/149809.rs ... ok
test [crashes] tests/crashes/150040.rs ... ok
---

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

------rustc stderr------------------------------
error: expected expression, found `ty` metavariable
##[error]  --> /checkout/tests/crashes/148891.rs:7:26
   |
 5 |         pub enum TokenKind {
   |                  --------- while parsing this enum
 6 |             #[cfg(test)]
 7 |             STRING ([u8; $inner]),
   |                          ^^^^^^ expected expression
...
12 | values!(String);
   | --------------- in this macro invocation
   |
   = help: enum variants can be `Variant`, `Variant = <integer>`, `Variant(Type, ..., TypeN)` or `Variant { fields: Types }`
   = note: this error originates in the macro `values` (in Nightly builds, run with -Z macro-backtrace for more info)

error: macro expansion ignores `)` and any tokens following
##[error]  --> /checkout/tests/crashes/148891.rs:7:33
   |
 7 |             STRING ([u8; $inner]),
   |                                 ^
...
12 | values!(String);
   | --------------- caused by the macro expansion here
   |
   = note: the usage of `values!` is likely invalid in item context

error: aborting due to 2 previous errors


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

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/148891.rs' panicked at src/tools/compiletest/src/runtest/crashes.rs:16:18:
fatal error
stack backtrace:
   8: __rustc::rust_begin_unwind

@rust-bors 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 Jun 29, 2026
@rust-bors

rust-bors Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

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

This rollup was thus unapproved.

@rust-bors 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 Jun 29, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors try cancel

@rust-bors

rust-bors Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Try build cancelled. Cancelled workflows:

@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 Jun 29, 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-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend A-test-infra-minicore Area: `minicore` test auxiliary and `//@ add-core-stubs` A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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-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.