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

JonathanBrouwer · 2026-09-28T20:33:54Z

Successful merges:

Add std::fs::{Home|Media}Dirs #158936 (Add std::fs::{Home|Media}Dirs)
Additional NonZero conversions #129036 (Additional NonZero conversions)
Avoid recording unnameable extern crate aliases in diagnostic metadata #158997 (Avoid recording unnameable extern crate aliases in diagnostic metadata)
Stabilize funnel_shifts (including const) #161015 (Stabilize funnel_shifts (including const))
Stabilize Result::into_{ok,err} #161712 (Stabilize Result::into_{ok,err})
Add support for -Zsanitizer-cfi-minimal-runtime #162493 (Add support for -Zsanitizer-cfi-minimal-runtime)
next solver: prefer to select impl candidates over global where-clause candidates #162655 (next solver: prefer to select impl candidates over global where-clause candidates)
Fix intra doc link resolution when a doc comment is composed of both inner and outer doc comment #162862 (Fix intra doc link resolution when a doc comment is composed of both inner and outer doc comment)
make RustaceansAreAwesome satisfy trait bounds #163200 (make RustaceansAreAwesome satisfy trait bounds)
Move Arc and Rc into rcs mod #163331 (Move Arc and Rc into rcs mod)
implement #![feature(gca_adts)] #163427 (implement #![feature(gca_adts)])
do not complain about unstable target features on nightly #163428 (do not complain about unstable target features on nightly)
Add stable_bare_rustc helper in run-make-support #163444 (Add stable_rustc helper in run-make-support)
Allow using different index types when reading and writing to tables #163447 (Allow using different index types when reading and writing to tables)
Force the correct type variable to never for method resolution on an adjusted never type #163450 (Force the correct type variable to never for method resolution on an adjusted never type)

`funnel_shl` and `funnel_shr` have been around for close to a year, the unchecked versions for a number of months. These are reasonably small and uncontroversial, and it can be tricky to get similar performance with a fallback; stabilize them here. Newly stable API: impl {u8, u16, u32, u64, u128, usize} { pub const fn funnel_shl(self, right: Self, shift: u32) -> Self; pub const fn funnel_shr(self, right: Self, shift: u32) -> Self; pub const unsafe fn unchecked_funnel_shl(self, right: Self, shift: u32) -> Self; pub const unsafe fn unchecked_funnel_shr(self, right: Self, shift: u32) -> Self; } The tracking issue also mentions a `wrapping_` version but it has not been implemented. Tracking issue: RUST-145686

For production use, we should only link in the ubsan_minimal runtime, instead of the complete ubsan runtime. This adds support for both cfi-recover and cfi-diag to use the minimal runtime when `-Zsanitizer-cfi-minimal-runtime` is specified. This also includes tests, to ensure the flag can only be used if either cfi-recover or cfi-diag is enabled, it doesn't disrupt the original behavior, and links in the correct runtime when specified. Co-Authored-By: Bastian Kersting <bkersting@google.com>

Co-Authored-By: Bastian Kersting <bkersting@google.com>

Only check `SanitizerCfiMinimalRuntimeRequiresCfiRecoverOrDiag` if CFI is actually enabled. Use `is_sanitizer_cfi_minimal_runtime_enabled()` helper within `link.rs`.

Tracking issue: rust-lang#61695

…tion

…Source::Path` Use the `DefPath` to determine whether an `extern crate` item is globally nameable. `extern crate` items nested inside value namespaces cannot be referred to by a stable path outside their enclosing scope. Record them as `ExternCrateSource::Path` instead of `ExternCrateSource::Extern` so later path resolution does not reconstruct unnameable paths.

…temporarily to keep file history

…inner and outer doc comment

…adjusted never type

also includes: - std::env::split_paths_ref - std::os::{darwin|unix|windows}::{Home|Media}DirsExt

JonathanBrouwer · 2026-09-28T20:34:17Z

@bors r+ p=5 force

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-28T20:34:20Z

📌 Commit c8de656 has been approved by JonathanBrouwer

It is now in the queue for this repository.

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

…uwer Rollup of 15 pull requests Successful merges: - #158936 (Add `std::fs::{Home|Media}Dirs`) - #129036 (Additional NonZero conversions) - #158997 (Avoid recording unnameable `extern crate` aliases in diagnostic metadata) - #161015 (Stabilize `funnel_shifts` (including `const`)) - #161712 (Stabilize `Result::into_{ok,err}`) - #162493 (Add support for -Zsanitizer-cfi-minimal-runtime) - #162655 (next solver: prefer to select impl candidates over global where-clause candidates) - #162862 (Fix intra doc link resolution when a doc comment is composed of both inner and outer doc comment) - #163200 (make `RustaceansAreAwesome` satisfy trait bounds) - #163331 (Move `Arc` and `Rc` into `rcs` mod) - #163427 (implement #![feature(gca_adts)]) - #163428 (do not complain about unstable target features on nightly) - #163444 (Add `stable_rustc` helper in `run-make-support`) - #163447 (Allow using different index types when reading and writing to tables) - #163450 (Force the correct type variable to never for method resolution on an adjusted never type)

rust-log-analyzer · 2026-09-28T22:11:13Z

The job test-x86_64-mingw-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 fs::tests::read_large_dir ... ok

failures:

---- fs::dirs::tests::test_home_dirs_field_hookup_matches stdout ----

thread 'fs::dirs::tests::test_home_dirs_field_hookup_matches' (8056) panicked at library\std\src\fs\dirs.rs:419:9:
config home directory path must be absolute
---- fs::dirs::tests::test_home_dirs_field_hookup_matches stdout end ----
---- fs::dirs::tests::test_media_dirs_field_hookup_matches stdout ----

thread 'fs::dirs::tests::test_media_dirs_field_hookup_matches' (2176) panicked at library\std\src\fs\dirs.rs:457:9:
desktop directory path must be absolute
---- fs::dirs::tests::test_media_dirs_field_hookup_matches stdout end ----

failures:
    fs::dirs::tests::test_home_dirs_field_hookup_matches
    fs::dirs::tests::test_media_dirs_field_hookup_matches

test result: FAILED. 421 passed; 2 failed; 6 ignored; 0 measured; 0 filtered out; finished in 20.71s

error: test failed, to rerun pass `-p std --lib`
Bootstrap failed while executing `test --stage 2 --skip=compiler --skip=src`
Currently active steps:
test::Crate { build_compiler: Compiler { stage: 2, host: x86_64-pc-windows-gnu, forced_compiler: false }, target: x86_64-pc-windows-gnu, mode: Std, crates: ["alloc", "alloctests", "compiler_builtins", "core", "coretests", "panic_abort", "panic_unwind", "proc_macro", "rustc-std-workspace-core", "std", "std_detect", "sysroot", "test", "unwind"] } at src\bootstrap\src\core\build_steps\test.rs:3528
Build completed unsuccessfully in 1:28:25
make: *** [Makefile:126: ci-mingw-x] Error 1
  local time: Mon Sep 28 22:10:51 CUT 2026
  network time: Mon, 28 Sep 2026 22:10:52 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

rust-bors · 2026-09-28T23:09:12Z

💔 Test for d899ff2 failed: CI. Failed jobs:

try - test-i686-msvc (web logs, enhanced plaintext logs)
try - test-x86_64-mingw-1 (web logs, enhanced plaintext logs)
try - test-x86_64-msvc-1 (web logs, enhanced plaintext logs)

rust-log-analyzer · 2026-09-28T23:18:16Z

The job test-aarch64-msvc-1 failed! Check out the build log: (web) (plain enhanced) (plain)

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

failures:

---- fs::dirs::tests::test_home_dirs_field_hookup_matches stdout ----

thread 'fs::dirs::tests::test_home_dirs_field_hookup_matches' (5512) panicked at library\std\src\fs\dirs.rs:419:9:
config home directory path must be absolute
---- fs::dirs::tests::test_home_dirs_field_hookup_matches stdout end ----
---- fs::dirs::tests::test_media_dirs_field_hookup_matches stdout ----

thread 'fs::dirs::tests::test_media_dirs_field_hookup_matches' (5784) panicked at library\std\src\fs\dirs.rs:457:9:
desktop directory path must be absolute
---- fs::dirs::tests::test_media_dirs_field_hookup_matches stdout end ----

failures:
    fs::dirs::tests::test_home_dirs_field_hookup_matches
    fs::dirs::tests::test_media_dirs_field_hookup_matches

test result: FAILED. 414 passed; 2 failed; 10 ignored; 0 measured; 0 filtered out; finished in 18.48s

error: test failed, to rerun pass `-p std --lib`
Bootstrap failed while executing `test --stage 2 --skip=compiler --skip=src`
Currently active steps:
test::Crate { build_compiler: Compiler { stage: 2, host: aarch64-pc-windows-msvc, forced_compiler: false }, target: aarch64-pc-windows-msvc, mode: Std, crates: ["alloc", "alloctests", "compiler_builtins", "core", "coretests", "panic_abort", "panic_unwind", "proc_macro", "rustc-std-workspace-core", "std", "std_detect", "sysroot", "test", "unwind"] } at src\bootstrap\src\core\build_steps\test.rs:3528
Build completed unsuccessfully in 1:31:16
make: *** [Makefile:115: ci-msvc-py] Error 1
  local time: Mon Sep 28 16:17:47 PDT 2026
  network time: Mon, 28 Sep 2026 23:17:47 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

rust-bors · 2026-09-28T23:19:36Z

💔 Test for eba8d41 failed: CI. Failed job:

auto - test-aarch64-msvc-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-09-29T04:25:28Z

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

tgross35 · 2026-09-29T04:25:29Z

#158936 (comment)

tgross35 and others added 30 commits August 25, 2026 22:39

minor cleanup for minimal runtime test

4d68be3

Add target modifier for -Zsanitizer-cfi-minimal-runtime

855d8a2

Co-Authored-By: Bastian Kersting <bkersting@google.com>

Make -Zsanitizer-cfi-minimal-runtime also dependent on -Zsanitizer=cfi

a42ab2f

Fix tests with new cfi-minimal-runtime target modifier

bba4a3f

Fix linter issue in diagnostics.rs

775c187

Fix broken test introduced by cfi-minimal-runtime target modifier

3058339

Skip gcc for CFI runtime tests

7aacc8a

use match to determine correct ubsan cfi handler

8e5ad6c

make RustaceansAreAwesome satisfy trait bounds

452a7ca

Additional NonZero conversions

b6f9bfc

Address review feedback

20b6fd6

Only check `SanitizerCfiMinimalRuntimeRequiresCfiRecoverOrDiag` if CFI is actually enabled. Use `is_sanitizer_cfi_minimal_runtime_enabled()` helper within `link.rs`.

Stabilize Result::into_{ok,err}

f3b4f0f

Tracking issue: rust-lang#61695

Add -Ctarget-feature=-crt-static to CFI minimal runtime tests

a579f7e

Limit CFI run-make test to Linux

0879316

test(imports): add baseline regression for hidden extern crate sugges…

188011a

…tion

Move alloc::rc into alloc::rcs

26b5f90

Rename library/alloc/src/sync.rs to library/alloc/src/rcs/arc.rs …

f74f6ea

…temporarily to keep file history

Re-export alloc::rcs::arc::* in alloc::sync

cba3237

Fix intra doc link resolution when a doc comment is composed of both …

2e58a77

…inner and outer doc comment

implement #![feature(gca_adts)]

9e8ca58

Force the correct type variable to never for method resolution on an …

ceee44b

…adjusted never type

Run the method-on-never type on the next trait solver

f3b6502

Add stable_rustc helper in run-make-support

773ad19

Allow using different index types when reading and writing to tables

62ce017

select: prefer impl candidates over where clauses

b6d0fb1

do not complain about unstable target features on nightly

48b2592

impl std::fs::{Home|Media}Dirs

9495d19

also includes: - std::env::split_paths_ref - std::os::{darwin|unix|windows}::{Home|Media}DirsExt

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 28, 2026

This comment has been minimized.

Sign in to view

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 28, 2026

tgross35 mentioned this pull request Sep 29, 2026

Add std::fs::{Home|Media}Dirs #158936

Merged

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

tgross35 closed this Sep 29, 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 29, 2026

Navigation Menu

Uh oh!

Rollup of 15 pull requests - #163460

Rollup of 15 pull requests#163460
JonathanBrouwer wants to merge 45 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-OIZLNAi

JonathanBrouwer commented Sep 28, 2026

Uh oh!

JonathanBrouwer commented Sep 28, 2026

Uh oh!

rust-bors Bot commented Sep 28, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-log-analyzer commented Sep 28, 2026

Uh oh!

rust-bors Bot commented Sep 28, 2026

Uh oh!

rust-log-analyzer commented Sep 28, 2026

Uh oh!

rust-bors Bot commented Sep 28, 2026

Uh oh!

rust-bors Bot commented Sep 29, 2026

Uh oh!

tgross35 commented Sep 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

Uh oh!

Conversation

JonathanBrouwer commented Sep 28, 2026

Uh oh!

JonathanBrouwer commented Sep 28, 2026

Uh oh!

rust-bors Bot commented Sep 28, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-log-analyzer commented Sep 28, 2026

Uh oh!

rust-bors Bot commented Sep 28, 2026

Uh oh!

rust-log-analyzer commented Sep 28, 2026

Uh oh!

rust-bors Bot commented Sep 28, 2026

Uh oh!

rust-bors Bot commented Sep 29, 2026

Uh oh!

tgross35 commented Sep 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants