Rollup of 7 pull requests by GuillaumeGomez · Pull Request #157656 · rust-lang/rust

GuillaumeGomez · 2026-06-09T09:43:20Z

Successful merges:

Disable tests/debuginfo/pretty-std.rs OsString cdb check #157503 (Disable tests/debuginfo/pretty-std.rs OsString cdb check)
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

…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.

@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)

…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-09T09:44:13Z

@bors r+ p=5 rollup=never

rust-bors · 2026-06-09T09:44:16Z

📌 Commit dc420a3 has been approved by GuillaumeGomez

It is now in the queue for this repository.

JonathanBrouwer · 2026-06-09T09:48:36Z

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

Rollup of 7 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 · 2026-06-09T10:30:59Z

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

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

[RUSTC-TIMING] regex_syntax test:false 20.513
[RUSTC-TIMING] num_traits test:false 1.935
   Compiling crossbeam-channel v0.5.15
   Compiling inout v0.2.2
warning: capstone-sys@0.18.0: sccache: error: Timed out waiting for server startup. Maybe the remote service is unreachable?
warning: capstone-sys@0.18.0: Run with SCCACHE_LOG=debug SCCACHE_NO_DAEMON=1 to get more information
error: failed to run custom build command for `capstone-sys v0.18.0`
note: To improve backtraces for build dependencies, set the CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG=true environment variable to enable debug information generation.

Caused by:
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/release/build/capstone-sys-0de4464002624c0f/build-script-build` (exit status: 1)
  --- stdout
  OUT_DIR = Some(/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/capstone-sys-a293da486668113e/out)
  OPT_LEVEL = Some(3)
  TARGET = Some(x86_64-unknown-linux-gnu)
  HOST = Some(x86_64-unknown-linux-gnu)
  cargo:rerun-if-env-changed=CC_x86_64-unknown-linux-gnu
  CC_x86_64-unknown-linux-gnu = None
  cargo:rerun-if-env-changed=CC_x86_64_unknown_linux_gnu
  CC_x86_64_unknown_linux_gnu = Some(sccache cc)
  cargo:rerun-if-env-changed=CC_KNOWN_WRAPPER_CUSTOM
  CC_KNOWN_WRAPPER_CUSTOM = None
  cargo:rerun-if-env-changed=CC_ENABLE_DEBUG_OUTPUT
  cargo:rerun-if-env-changed=CRATE_CC_NO_DEFAULTS
  CRATE_CC_NO_DEFAULTS = None
  DEBUG = Some(false)
  CARGO_CFG_TARGET_FEATURE = Some(fxsr,sse,sse2,x87)
  cargo:rerun-if-env-changed=CFLAGS
  CFLAGS = None
  cargo:rerun-if-env-changed=HOST_CFLAGS
  HOST_CFLAGS = None
  cargo:rerun-if-env-changed=CFLAGS_x86_64_unknown_linux_gnu
  CFLAGS_x86_64_unknown_linux_gnu = Some()
  cargo:rerun-if-env-changed=CC_SHELL_ESCAPED_FLAGS
  CC_SHELL_ESCAPED_FLAGS = None
  cargo:rerun-if-env-changed=CFLAGS_x86_64-unknown-linux-gnu
  CFLAGS_x86_64-unknown-linux-gnu = None
  CARGO_ENCODED_RUSTFLAGS = Some(--cfg=windows_raw_dylib-Csymbol-mangling-version=v0-Zannotate-moves-Zunstable-options--check-cfg=cfg(bootstrap)--check-cfg=cfg(rust_analyzer)-Zmacro-backtrace-Csplit-debuginfo=off-Clink-arg=-L/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/lib-Clink-args=-Wl,-z,origin-Clink-args=-Wl,-rpath,$ORIGIN/../lib-Alinker-messages-Zunstable-options)
  OUT_DIR = Some(/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/capstone-sys-a293da486668113e/out)
  cargo:rerun-if-env-changed=CC_ENABLE_DEBUG_OUTPUT
  cargo:rerun-if-env-changed=CRATE_CC_NO_DEFAULTS
  CRATE_CC_NO_DEFAULTS = None
  TARGET = Some(x86_64-unknown-linux-gnu)
  CARGO_CFG_TARGET_FEATURE = Some(fxsr,sse,sse2,x87)
  HOST = Some(x86_64-unknown-linux-gnu)
  cargo:rerun-if-env-changed=CFLAGS
  CFLAGS = None
  cargo:rerun-if-env-changed=HOST_CFLAGS
  HOST_CFLAGS = None
  cargo:rerun-if-env-changed=CFLAGS_x86_64_unknown_linux_gnu
  CFLAGS_x86_64_unknown_linux_gnu = Some()
  cargo:rerun-if-env-changed=CC_SHELL_ESCAPED_FLAGS
  CC_SHELL_ESCAPED_FLAGS = None
  cargo:rerun-if-env-changed=CFLAGS_x86_64-unknown-linux-gnu
  CFLAGS_x86_64-unknown-linux-gnu = None
  cargo:warning=sccache: error: Timed out waiting for server startup. Maybe the remote service is unreachable?
  cargo:warning=Run with SCCACHE_LOG=debug SCCACHE_NO_DAEMON=1 to get more information

  --- stderr


  error occurred in cc-rs: command did not execute successfully (status code exit status: 2): LC_ALL="C" "sccache" "cc" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-I" "capstone/include" "-w" "-DCAPSTONE_USE_SYS_DYN_MEM" "-DCAPSTONE_HAS_X86" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/capstone-sys-a293da486668113e/out/c2d906b55b9e1a32-MCInst.o" "-c" "capstone/MCInst.c"


warning: build failed, waiting for other jobs to finish...
[RUSTC-TIMING] inout test:false 0.226
[RUSTC-TIMING] crossbeam_channel test:false 1.562

GuillaumeGomez · 2026-06-09T11:48:40Z

@bors retry

rust-bors · 2026-06-09T11:48:42Z

❗ You can only retry pull requests that are approved and have a previously failed auto build.

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

Closing in favour of #157663.

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

This pull request was unapproved due to being closed.

rust-bors · 2026-06-09T13:19:08Z

💔 Test for 521a348 failed: CI. Failed job:

try - x86_64-gnu-aux (web logs, enhanced plaintext logs)

rajgandhi1 and others added 20 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

Add splat builtin attribute & feature gate

2a3a8dd

Add AST validation for #[splat]

5a93925

Report duplicate relaxed bounds during ast lowering

16aa9d0

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

49eef1f

…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

rust-bors Bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 9, 2026

rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 9, 2026

GuillaumeGomez mentioned this pull request Jun 9, 2026

Rollup of 3 pull requests #157648

Closed

This comment has been minimized.

Sign in to view

GuillaumeGomez closed this Jun 9, 2026

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

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

GuillaumeGomez deleted the rollup-khDLero branch June 9, 2026 12:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests#157656

Rollup of 7 pull requests#157656
GuillaumeGomez wants to merge 20 commits into
rust-lang:mainfrom
GuillaumeGomez:rollup-khDLero

GuillaumeGomez commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

JonathanBrouwer commented Jun 9, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 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!

JonathanBrouwer commented Jun 9, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

GuillaumeGomez commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants