Rollup of 16 pull requests by JonathanBrouwer · Pull Request #161952 · rust-lang/rust

JonathanBrouwer · 2026-08-28T22:05:58Z

Successful merges:

std: optimise IO error formatting #161945 (std: optimise IO error formatting)
attach global target features to module-level assembly #160594 (attach global target features to module-level assembly)
implement [u8]::split_ascii_whitespace #161577 (implement [u8]::split_ascii_whitespace)
fix ICE in generic_const_parameter_types with inherents #161858 (fix ICE in generic_const_parameter_types with inherents)
[bootstrap] Don't reverse the order of dylib search path entries #161377 ([bootstrap] Don't reverse the order of dylib search path entries)
Use drop_guard in some places in {core,alloc,std} #161702 (Use drop_guard in some places in {core,alloc,std})
Document PartialOrd behavior for Option<T> where T: PartialOrd #161804 (Document PartialOrd behavior for Option where T: PartialOrd)
loongarch: support passing u128/i128 to inline assembly #161865 (loongarch: support passing u128/i128 to inline assembly)
Do not load macro metadata for local definitions in rustdoc #161877 (Do not load macro metadata for local definitions in rustdoc)
fix rustc_lint_defs doctest issues #161880 (fix rustc_lint_defs doctest issues)
better deal with internal features being injected into doctests #161883 (better deal with internal features being injected into doctests)
std: uefi: fix File::seek returning the EOF sentinel #161887 (std: uefi: fix File::seek returning the EOF sentinel)
Reject contract attributes without arguments #161897 (Reject contract attributes without arguments)
Report the configured Polonius default in -Z help #161909 (Report the configured Polonius default in -Z help)
Add rustdoc-html regression test for generated macro #161910 (Add rustdoc-html regression test for generated macro)
Retroactively add relnotes for bool::{ok_or,ok_or_else} (1.98.0) #161914 (Retroactively add relnotes for bool::{ok_or,ok_or_else} (1.98.0))

seek(SeekFrom::End(0)) special-cased the offset to the UEFI 0xFFFFFFFFFFFFFFFF "set position to end of file" sentinel, then returned that value as the new stream position. so seek reported u64::MAX instead of the file size, and the default Seek::stream_len did too. compute the offset from the file size in every End case instead.

std: optimise IO error formatting The current OS error formatting logic goes through a bit of trouble (the `format!` macro, temporary allocations and unnecessary copying) to create a `String` for `Formatter::write_str`. It's more efficient and arguably simpler to have the formatting logic write into the `Formatter` directly instead.

@nikic

…ures, r=nikic attach global target features to module-level assembly fixes rust-lang#80608 fixes rust-lang#127269 At long last, we can forward global target features to LLVM and it will preserve the target features a block of module-level assembly was defined with through LTO. cc @nikic (who made this happen) cc @RalfJung any nasty side-effects we might be overlooking here?

…, r=nia-e implement [u8]::split_ascii_whitespace Had to create a new pr because in the previous one i somehow deleted all the commits with git. Tracking issue: rust-lang#147878 [u8] is also missing normal split_whitespace, but that seems like an issue for another pr.

@lapla-cogito

…er_types, r=BoxyUwU fix ICE in generic_const_parameter_types with inherents tracking issue: rust-lang#137626 relevant PR where the code was added: rust-lang#154853 (fyi ping @lapla-cogito - nws that this was buggy, it's extreeeemely subtle and easy to miss! ❤️ I mean, I also reviewed that PR and missed it too :3 ) discovered when implementing a change that explicitly tracks whether the args for inherent associated consts are in "self form" or "impl form" Following along the test case: - `normalize_canonicalized_inherent_projection` is called with `AliasTermKind::InherentConst` with the generic args being in "self form", i.e. `[ThreeTypes<u8, u16, u32>]` - `traits::normalize_inherent_projection` is called with said alias - it calls `compute_inherent_assoc_term_args`, which does the dance of generating fresh vars for each param in the impl block, equating with the self type, and returning what the fresh vars solved to. This converts from "self args" to "impl args", i.e. `[u8, u16, u32]` - it then calls `const_of_item` and instantiates with `[u8, u16, u32]`. this is correct and good, `const_of_item` expects "impl form" args. - it then calls `push_const_arg_has_type_obligation` - which calls `type_of` and instantiates with `[u8, u16, u32]` to fetch the type of the const, to be able to register a `ConstArgHasType`. this is correct and good, `type_of` expects "impl form" args. - `traits::normalize_inherent_projection` returns, dropping the impl form args it computed - `normalize_canonicalized_inherent_projection` calls `ocx.register_obligations(const_arg_has_type_obligation(...))`, passing `goal`. Remember that `goal` has the original "self args" generic arg format. - `const_arg_has_type_obligation` calls `type_of` and instantiates with `[ThreeTypes<u8, u16, u32>]`. This is no good very bad!! `type_of` expects "impl form" args, not "self form"!! - ICE!! `type parameter T3/rust-lang#2 (T3/rust-lang#2/2) out of range when instantiating, args=[ThreeTypes<u8, u16, u32>]` The reason I filed this under `feature(generic_const_parameter_types)` is because for this bug to manifest, `type_of` must return a type that actually references a generic param to be able to trigger an ICE. Otherwise, the buggy incorrect args are silently ignored and compilation continues "fine". The fix: `normalize_inherent_projection` already registers a `ConstArgHasType`. why are we doing it a second time. just delete it. 💀 r? @BoxyUwU

@Kobzol

…eyouxu [bootstrap] Don't reverse the order of dylib search path entries The `add_dylib_path` helper function prepends paths to the beginning of the dynamic linker search path, but it reverses their order while doing so. This is surprising and undocumented, and seems to be unexpected by several callers of this function. Particularly, [`rustc_lib_paths`](https://github.com/rust-lang/rust/blob/f7d782a3be46d6bb4b9792fe69a61db389ba1769/src/bootstrap/src/core/builder/mod.rs#L1375) appends the `ci-llvm` path to the list it returns; reversing the order puts `ci-llvm` at a higher priority than the compiler's lib directory. On my system, this currently causes `./x test` to fail (when building the unstable book), because the stage0 compiler is run using CI LLVM instead of stage0 LLVM (which are currently different because stage0 is on LLVM 22 while main is on LLVM 23). Might be worth a try build as this change could potentially cause issues if there is somewhere we depend on this ordering reversal. I checked all the call-sites (and ran `./x test` locally) and I don't think anyone *intentionally* relied on the ordering being reversed. I did find one snippet that concerned me (from rust-lang#144303, cc @Kobzol): https://github.com/rust-lang/rust/blob/f7d782a3be46d6bb4b9792fe69a61db389ba1769/src/bootstrap/src/core/build_steps/test.rs#L437-L448 The comment states we're inserting `builder.rustc_libdir(tested_compiler)` at the highest priority in the search path, but because `add_dylib_path` reversed the ordering, it's actually inserted at the *lowest* priority. I don't know how to reproduce the issue this was supposed to fix, so I can't be sure that this PR doesn't cause a regression. Follow-up to rust-lang#161335. r? @jieyouxu

…they Use `drop_guard` in some places in {core,alloc,std} - Tracking issue: rust-lang#144426 - Will conflict with rust-lang#161520 - rust-lang#161550 would also be cool occasionally Didn't touch the places where manual `impl Drop`s had `#[inline]` on their `fn drop` or where the guard type had other `impl`s beside `Drop` and/or was named a lot. No LLMs used, only pure human slop.

…, r=nia-e Document PartialOrd behavior for Option<T> where T: PartialOrd Fixes [rust-lang#161746]("rust-lang#161746") This is my first time contributing to Rust and all feedback is welcome. I ran these after making changes. `./x test library/core --stage 1` `./x.py setup` `./x test tidy --bless`

@taiki-e

loongarch: support passing `u128`/`i128` to inline assembly Tracking issue: rust-lang#133416 LLVM support: llvm/llvm-project#211464 cc @taiki-e

JonathanBrouwer · 2026-08-28T22:06:13Z

@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 · 2026-08-28T22:06:16Z

📌 Commit 190b25c has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 16 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-log-analyzer · 2026-08-28T22:34:14Z

The job dist-various-1 failed! Check out the build log: (web) (plain enhanced) (plain)

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


error[E0433]: cannot find type `DropGuard` in this scope
   --> /rustc/e15ff0336f98d3e52ea2e8a721d2c3694a3d8447/library/std/src/sys/pal/unix/sync/condvar.rs:164:24
    |
164 |             let attr = DropGuard::new(attr, |attr| {
    |                        ^^^^^^^^^ use of undeclared type `DropGuard`
    |
help: consider importing one of these structs
    |
  1 + use crate::mem::DropGuard;

…uwer Rollup of 16 pull requests Successful merges: - #161945 (std: optimise IO error formatting) - #160594 (attach global target features to module-level assembly) - #161577 (implement [u8]::split_ascii_whitespace) - #161858 (fix ICE in generic_const_parameter_types with inherents) - #161377 ([bootstrap] Don't reverse the order of dylib search path entries) - #161702 (Use `drop_guard` in some places in {core,alloc,std}) - #161804 (Document PartialOrd behavior for Option<T> where T: PartialOrd) - #161865 (loongarch: support passing `u128`/`i128` to inline assembly) - #161877 (Do not load macro metadata for local definitions in rustdoc) - #161880 (fix rustc_lint_defs doctest issues) - #161883 (better deal with internal features being injected into doctests) - #161887 (std: uefi: fix File::seek returning the EOF sentinel) - #161897 (Reject contract attributes without arguments) - #161909 (Report the configured Polonius default in -Z help) - #161910 (Add rustdoc-html regression test for generated macro) - #161914 (Retroactively add relnotes for `bool::{ok_or,ok_or_else}` (1.98.0))

rust-bors · 2026-08-29T01:23:52Z

💔 Test for e15ff03 failed: CI. Failed job:

try - dist-various-1 (web logs, enhanced plaintext logs)

rust-log-analyzer · 2026-08-29T01:34:08Z

The job dist-various-1 failed! Check out the build log: (web) (plain enhanced) (plain)

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


error[E0433]: cannot find type `DropGuard` in this scope
   --> /rustc/5ebe22c0c93358f338b529b4ba50079aea74185d/library/std/src/sys/pal/unix/sync/condvar.rs:164:24
    |
164 |             let attr = DropGuard::new(attr, |attr| {
    |                        ^^^^^^^^^ use of undeclared type `DropGuard`
    |
help: consider importing one of these structs
    |
  1 + use crate::mem::DropGuard;

rust-bors · 2026-08-29T01:35:37Z

💔 Test for 5ebe22c failed: CI. Failed job:

auto - dist-various-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-08-29T01:50:00Z

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

rust-bors · 2026-08-29T05:18:19Z

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

jnkel and others added 30 commits August 19, 2026 16:43

[bootstrap] Don't reverse the order of dylib search path entries

67e8a19

forward global target features to module-level assembly

37aaf5c

Document PartialOrd behavior for Option<T> where T: PartialOrd

8ceed4d

Formatting changes for HTML tag errors

3fec803

loongarch: support passing u128/i128 to inline assembly

bb75ebf

Change the doc comments to link to the relevant doc section

97fe424

add test

a1fb7b3

do not load macro metadata for local definitions in rustdoc

0f08915

better deal with internal features being injected into doctests

42629e3

fix rustc_lint_defs doctest issues

a0ec511

Add regression test for empty contract attributes with lifetime lints

7047ae8

Reject contract attributes without arguments

12f970e

Add regression test for the Polonius help default

9c6ebca

fix ICE in generic_const_parameter_types with inherents

d471202

Report the configured Polonius default in -Z help

f31b77f

Add rustdoc-html regression test for generated macro

66bbc14

Retroactively add relnotes for bool::{ok_or,ok_or_else}

448757d

Clarify None and Some comparisons in docs

d3b2959

Use drop_guard in some places in {core,alloc,std}

9b2b381

std: optimize IO error formatting

d20d512

implement [u8]::split_ascii_whitespace

aee52d7

Rollup merge of rust-lang#161865 - heiher:inline-asm-i128, r=folkertdev

755d313

loongarch: support passing `u128`/`i128` to inline assembly Tracking issue: rust-lang#133416 LLVM support: llvm/llvm-project#211464 cc @taiki-e

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

Zalathar mentioned this pull request Aug 29, 2026

Use drop_guard in some places in {core,alloc,std} #161702

Open

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

JonathanBrouwer closed this Aug 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 Aug 29, 2026

Navigation Menu

Uh oh!

Uh oh!

Rollup of 16 pull requests - #161952

Rollup of 16 pull requests#161952
JonathanBrouwer wants to merge 38 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-4jSTm48

JonathanBrouwer commented Aug 28, 2026

Uh oh!

JonathanBrouwer commented Aug 28, 2026

Uh oh!

rust-bors Bot commented Aug 28, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Aug 28, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Aug 29, 2026

Uh oh!

rust-log-analyzer commented Aug 29, 2026

Uh oh!

rust-bors Bot commented Aug 29, 2026

Uh oh!

rust-bors Bot commented Aug 29, 2026

Uh oh!

rust-bors Bot commented Aug 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

Uh oh!

Uh oh!

Conversation

JonathanBrouwer commented Aug 28, 2026

Uh oh!

JonathanBrouwer commented Aug 28, 2026

Uh oh!

rust-bors Bot commented Aug 28, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Aug 28, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Aug 29, 2026

Uh oh!

rust-log-analyzer commented Aug 29, 2026

Uh oh!

rust-bors Bot commented Aug 29, 2026

Uh oh!

rust-bors Bot commented Aug 29, 2026

Uh oh!

rust-bors Bot commented Aug 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants