Rollup of 10 pull requests by GuillaumeGomez · Pull Request #157663 · rust-lang/rust

GuillaumeGomez · 2026-06-09T12:09:48Z

Successful merges:

bootstrap: Handle dotted table keys when parsing bootstrap.toml #157335 (bootstrap: Handle dotted table keys when parsing bootstrap.toml)
Disable tests/debuginfo/pretty-std.rs OsString cdb check #157503 (Disable tests/debuginfo/pretty-std.rs OsString cdb check)
rustdoc: Test & document test_harness code block attribute #148183 (rustdoc: Test & document test_harness code block attribute)
Fix async drop glue for Box<T> #156067 (Fix async drop glue for Box)
fix improper ctypes in Znext solver #156399 (fix improper ctypes in Znext solver)
Implement rustc_public::CrateDef{,Type} for FieldDef #157410 (Implement rustc_public::CrateDef{,Type} for FieldDef)
Arg splat experiment - syntax impl #157605 (Arg splat experiment - syntax impl)
Add multibyte JSON diagnostic regression test #157630 (Add multibyte JSON diagnostic regression test)
Reorder impl restriction rendering and add bottom margin #157633 (Reorder impl restriction rendering and add bottom margin)
Report duplicate relaxed bounds during ast lowering #157642 (Report duplicate relaxed bounds during ast lowering)

Since approx. Windows SDK 20348, the corresponding cdb (and/or its underlying WinDbg engine) changed or regressed the `OsStr`/`OsString` visualization, and no longer renders the emoji. Since approx. SDK/cdb 26100, the output formatting of the string containing UTF-8 (i.e. the multi-byte emoji grapheme) seems to have further regressed (e.g. the end quotation mark is no longer shown and command output becomes garbled). Relevant issues: * RUST-88840 * RUST-148743 * RUST-88796

The hand-written reader bootstrap.py uses to find the stage0 cargo and rustc only recognized `[table]` headers, so dotted keys like `build.cargo = "..."` were ignored. Parse the dotted prefix on each key as the table it belongs to, resolved relative to the enclosing section, and scope the cargo/rustc lookup to `[build]` so the Python and Rust sides agree.

…oad it from the per-owner info instead

This makes a few changes to rustc_public to make it a little easier to analyze ADT types. * It implements `CrateDef` and `CrateDefType` for `FieldDef`, which allows easy access to the underlying `DefId`, names, and tool annotations. * It adds `Crate::adts` to simplify stepping through all the ADTs in the crate. Note that I did use Gemini to assist with writing this patch, but I wrote most of it, reviewed all the vode, and verified the tests pass locally.

Moreover, flesh out the rustdoc book section about code block attributes.

* Fix async drop glue for Box<T> * Adress reviewer concerns * Address more concerns

…keys, r=clubby789 bootstrap: Handle dotted table keys when parsing bootstrap.toml Fixes rust-lang#156948 `bootstrap.py` has a small hand-rolled reader that pulls the stage0 cargo and rustc out of `bootstrap.toml` before the real TOML parser is built. It only understood `[table]` headers, so the dotted form that `bootstrap.example.toml` now uses (`build.cargo = "..."`) was silently dropped, and the cargo/rustc lookup matched those keys in any table rather than only `[build]`. Teach the reader to strip an optional dotted prefix and treat it as the key's table, the same way `configure.py` does when it writes the file, and scope the cargo/rustc lookup to `[build]`. New tests cover the dotted form, equivalence with the section form, wrong-table rejection, and dotted target keys. *Disclosure: the code was written by AI (Claude); reviewed and tested by me.*

@wesleywiser

…db, r=Kobzol Disable `tests/debuginfo/pretty-std.rs` `OsString` cdb check ## Summary Since approx. Windows SDK 20348, the corresponding cdb (and/or its underlying WinDbg engine) changed or regressed the `OsStr`/`OsString` visualization, and no longer renders the emoji. Since approx. SDK/cdb 26100, the output formatting of the string containing UTF-8 (i.e. the multi-byte emoji grapheme) seems to have further regressed (e.g. the end quotation mark is no longer shown and command output becomes garbled). Relevant issues: * rust-lang#88840 * rust-lang#148743 * rust-lang#88796 This was failing for me locally on host Windows MSVC under `./x test tests/debuginfo`. And the issues re. this case failing has been open for a long while and have not been addressed, so I propose disabling this case. I believe this is either a regression or a change in cdb and/or the underlying WinDbg. I have not bothered filing such a cdb bug report, I don't know enough about this. The check was actually relaxed to not require the emoji to be rendered properly in the output in rust-lang#88842, but I feel like that regressed the original intention of the check (that multi-byte Unicode graphemes are properly rendered), so I just restored the original checks but commented them out. Maybe r? @wesleywiser (or compiler)

…test-harness, r=GuillaumeGomez rustdoc: Test & document `test_harness` code block attribute They were fully untested and undocumented previously despite being stable. Context: [#t-rustdoc > &rust-lang#96;test_harness&rust-lang#96; langstr @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/266220-t-rustdoc/topic/.60test_harness.60.20langstr/near/546748038). While at it, I've also improved the documentation for code block attributes in general. I was only inspired to do so because there was no good place for `test_harness` and because it got hard to skim due to a lack of subsubsections.

@rustbot

Fix async drop glue for Box<T> Fixes rust-lang#143658. This fixes async drop behavior for boxed values so that async drop glue reaches the boxed value’s async destructor in async drop context. The change updates async-drop needs-drop analysis so `Box<T>` is handled specially for async drop by considering the boxed pointee and allocator when deciding whether async drop glue is needed. This PR intentionally does not change the broader AsyncDrop design. It only fixes behavior under the existing `#![feature(async_drop)]` implementation. Reviewer notes: - `async-drop-box-allocator.rs` already covers async-dropping the allocator of a `Box`; this PR adds distinct coverage for the boxed value itself. - Boxed dyn pointees are intentionally not pulled into this fix, preserving existing dynamic async-drop limitations. - The change is isolated to async drop analysis; sync `needs_drop` behavior is unchanged. @rustbot label F-async_drop

…jdonszelmann fix improper ctypes in Znext solver Fixes rust-lang#156352.

Implement rustc_public::CrateDef{,Type} for FieldDef This makes a few changes to rustc_public to make it a little easier to analyze ADT types. * It implements `CrateDef` and `CrateDefType` for `FieldDef`, which allows easy access to the underlying `DefId`, names, and tool annotations. * It adds `Crate::adts` to simplify stepping through all the ADTs in the crate. Note that I did use Gemini to assist with writing this patch, but I wrote most of it, reviewed all the vode, and verified the tests pass locally.

…r=JonathanBrouwer Arg splat experiment - syntax impl This PR is part of the argument splatting lang experiment, and FFI overloading / C++ interop project goals: - rust-lang#153629 - https://rust-lang.github.io/rust-project-goals/2026/overloading-for-ffi.html - https://rust-lang.github.io/rust-project-goals/2025h2/interop-problem-map.html I've split it from rust-lang#153697 to make reviewing easier, see that PR for more details. The PR is the initial implementation of the feature: - `splat` incomplete feature gate - `#[splat]` attribute on function arguments - feature gate and UI tests for item type filtering, non-splattable arguments Once this PR merges, I'll rebase rust-lang#153697.

…r=folkertdev Add multibyte JSON diagnostic regression test Closes rust-lang#157148. This pr adds ui coverage for json diagnostics with rendered ansi output on a source line containing multibyte text. Current main emits the original warning without ICEing. This test maintains that behavior.

@GuillaumeGomez

…nder-fix, r=GuillaumeGomez Reorder `impl` restriction rendering and add bottom margin This PR moves the `impl` restriction rendering above the trait description. It also adds an ⓘ marker, italicizes the text, and adds a bottom margin. Tracking issue: rust-lang#105077 before: <img width="1108" height="651" alt="image" src="https://github.com/user-attachments/assets/520d95cf-a648-44e7-8036-e453cfbdf569" /> after: <img width="1085" height="671" alt="image" src="https://github.com/user-attachments/assets/84493e56-6227-433b-93d0-4fcbe28ac00c" /> r? @GuillaumeGomez cc @Urgau @jhpratt

…ering, r=fmease Report duplicate relaxed bounds during ast lowering Instead of during hir-ty-lowering. Not sure it is worth erroring on at all, but it's better to do it directly during lowering instead of collecting bounds after the fact.

GuillaumeGomez · 2026-06-09T12:10:00Z

@bors r+ rollup=never p=5

rust-bors · 2026-06-09T12:10:03Z

📌 Commit e502516 has been approved by GuillaumeGomez

It is now in the queue for this repository.

Rollup of 10 pull requests Successful merges: - #157335 (bootstrap: Handle dotted table keys when parsing bootstrap.toml) - #157503 (Disable `tests/debuginfo/pretty-std.rs` `OsString` cdb check) - #148183 (rustdoc: Test & document `test_harness` code block attribute) - #156067 (Fix async drop glue for Box<T>) - #156399 (fix improper ctypes in Znext solver) - #157410 (Implement rustc_public::CrateDef{,Type} for FieldDef) - #157605 (Arg splat experiment - syntax impl) - #157630 (Add multibyte JSON diagnostic regression test) - #157633 (Reorder `impl` restriction rendering and add bottom margin) - #157642 (Report duplicate relaxed bounds during ast lowering)

rust-bors · 2026-06-09T15:50:23Z

💔 Test for 492c116 failed: CI. Failed job:

auto - x86_64-gnu-distcheck (web logs, enhanced plaintext logs)

GuillaumeGomez · 2026-06-09T15:51:15Z

@bors retry

GuillaumeGomez · 2026-06-09T15:53:06Z

Closing in favour of #157673.

rust-bors · 2026-06-09T15:53:10Z

This pull request was unapproved due to being closed.

rajgandhi1 and others added 26 commits June 5, 2026 14:34

fix improper ctypes in Znext solver

dc14afd

constructs a TypingEnv with TypingMode::Borrowck now

9140c6c

change comment

79df01a

add comments to justify skip normalization

c28609f

Avoid passing the parent (== owner) node id to lower_generics and l…

45d2cb8

…oad it from the per-owner info instead

Add more tests

b869143

Reorder impl restriction rendering and add bottom margin

656124d

Add multibyte JSON diagnostic regression test

1b1e475

rustdoc: Test & document test_harness code block attribute

41bda8c

Moreover, flesh out the rustdoc book section about code block attributes.

Add splat builtin attribute & feature gate

2a3a8dd

Add AST validation for #[splat]

5a93925

Report duplicate relaxed bounds during ast lowering

16aa9d0

Fix async drop glue for Box<T>

2bc5e90

* Fix async drop glue for Box<T> * Adress reviewer concerns * Address more concerns

Rollup merge of rust-lang#156399 - rajgandhi1:unexpected_type_fix, r=…

538f54e

…jdonszelmann fix improper ctypes in Znext solver Fixes rust-lang#156352.

rust-bors Bot added the rollup A PR which is a rollup label Jun 9, 2026

rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-js Area: Rustdoc's JS front-end labels Jun 9, 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 Jun 9, 2026

GuillaumeGomez mentioned this pull request Jun 9, 2026

Rollup of 7 pull requests #157656

Closed

This comment has been minimized.

Sign in to view

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 Jun 9, 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 Jun 9, 2026

GuillaumeGomez closed this Jun 9, 2026

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 9, 2026

GuillaumeGomez deleted the rollup-Iwi31Tb branch June 9, 2026 15:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 10 pull requests#157663

Rollup of 10 pull requests#157663
GuillaumeGomez wants to merge 26 commits into
rust-lang:mainfrom
GuillaumeGomez:rollup-Iwi31Tb

GuillaumeGomez commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Conversation

GuillaumeGomez commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants