Rollup of 18 pull requests by jhpratt · Pull Request #157679 · rust-lang/rust

jhpratt · 2026-06-09T19:06:09Z

Successful merges:

Remove driver_lint_caps #152852 (Remove driver_lint_caps)
Change type of async context parameter after state transform. #157166 (Change type of async context parameter after state transform.)
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)
Remove ProcMacro enum from proc macro ABI #157571 (Remove ProcMacro enum from proc macro ABI)
rustdoc: Test & document test_harness code block attribute #148183 (rustdoc: Test & document test_harness code block attribute)
Fix marker trait winnowing depending on impl order #153847 (Fix marker trait winnowing depending on impl order)
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)
Make Literal::byte_character_value work with bytes as well #157338 (Make Literal::byte_character_value work with bytes as well)
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)
fix doc for unicode normalization faq on casefold APIs #157652 (fix doc for unicode normalization faq on casefold APIs)
Update to ar_archive_writer v0.5.2 #157661 (Update to ar_archive_writer v0.5.2)
Add test for matches in rustc_must_match_exhaustively #157668 (Add test for matches in rustc_must_match_exhaustively)

Failed merges:

Rename errors.rs file to diagnostics.rs (4/N) #157670 (Rename errors.rs file to diagnostics.rs (4/N))

The `TypeOutlives` handler in `evaluate_predicate_recursively` means to check whether a type in a `T: 'a` predicate has free regions, bound regions, non-region inference variables, or non-region generic parameters -- and if so, to return `EvaluatedToOkModuloRegions` rather than `EvaluatedToOk`. Correspondingly, the comment says "no free lifetimes or generic parameters". But the code was mistakenly checking `has_non_region_infer()` twice instead of checking both `has_non_region_infer()` and `has_non_region_param()`. This meant that `TypeOutlives(T, 'static)` where `T` is a type parameter returned `EvaluatedToOk` -- claiming the result holds unconditionally -- when the correct answer is `EvaluatedToOkModuloRegions`. The distinction matters during marker trait winnowing in `prefer_lhs_over_victim`, which uses `must_apply_considering_regions()` (true only for `EvaluatedToOk`) to decide whether one impl beats another when there are multiple candidates. With the bug, a `T: 'static`-bounded impl appeared equally as strong as an unrestricted impl, making the winner depend on source order. This caused spurious E0310 errors when the more-constrained impl happened to appear after the less-constrained one. This fixes Rust issue 109481. See PR 153847. This same symptom was originally filed as issue 84917 and fixed in PR 88139. Then PR 102472 rewrote the `TypeOutlives` handler, introducing the duplicate `has_non_region_infer()` and losing the param check, regressing this. Around this same time, issue 109481 was filed. It noted the connection to PR 102472 -- that the bug only appeared after it -- but the duplicate condition was not noticed.

It's harder than one would imagine to demonstrate that the `has_non_region_infer()` check in the `TypeOutlives` handler is load bearing (even though the check seems right analytically). Fortunately, we did find a way to show this. Let's add that test. In working that out, we found two other interesting ways of showing that the `has_non_region_param()` check matters. Let's add those too. Though we're concerned here with code in the old solver, we test against both.

It was only used by rustdoc and doesn't seem like it was necessary there. No tests fail at least.

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

Incorrect types can't cause unsafety and making it untyped will make it easier to get rid of the ProcMacro enum in the proc-macro ABI.

Instead encode this information in the crate metadata. This helps shrink the proc-macro ABI to just the parts necessary for transmitting raw bytes to perform RPC on top of.

@lcnr

…haustively, r=lqd Add test for matches in `rustc_must_match_exhaustively` r? @lcnr

jhpratt · 2026-06-09T19:06:24Z

@bors r+ rollup=never p=5

rust-bors · 2026-06-09T19:06:27Z

📌 Commit 15f07cc has been approved by jhpratt

It is now in the queue for this repository.

Rollup of 18 pull requests Successful merges: - #152852 (Remove driver_lint_caps) - #157166 (Change type of async context parameter after state transform.) - #157335 (bootstrap: Handle dotted table keys when parsing bootstrap.toml) - #157503 (Disable `tests/debuginfo/pretty-std.rs` `OsString` cdb check) - #157571 (Remove ProcMacro enum from proc macro ABI) - #148183 (rustdoc: Test & document `test_harness` code block attribute) - #153847 (Fix marker trait winnowing depending on impl order) - #156067 (Fix async drop glue for Box<T>) - #156399 (fix improper ctypes in Znext solver) - #157338 (Make `Literal::byte_character_value` work with bytes as well) - #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) - #157652 (fix doc for unicode normalization faq on `casefold` APIs) - #157661 (Update to ar_archive_writer v0.5.2) - #157668 (Add test for matches in `rustc_must_match_exhaustively`) Failed merges: - #157670 (Rename `errors.rs` file to `diagnostics.rs` (4/N))

rust-log-analyzer · 2026-06-09T20:46:26Z

The job dist-x86_64-linux-alt failed! Check out the build log: (web) (plain enhanced) (plain)

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

 Documenting rustc_hir_id v0.0.0 (/checkout/compiler/rustc_hir_id)
 Documenting rustc_feature v0.0.0 (/checkout/compiler/rustc_feature)
 Documenting rustc_index v0.0.0 (/checkout/compiler/rustc_index)
 Documenting rustc_baked_icu_data v0.0.0 (/checkout/compiler/rustc_baked_icu_data)
warning: hidden lifetime parameters in types are deprecated
  --> compiler/rustc_baked_icu_data/src/data/list_and_v1.rs.data:34:47
   |
34 | ...   fn load(&self, req: icu_provider::DataRequest) -> Result<icu_provider::DataResponse<icu_list::provider::ListAndV1>, icu_provid...
   |                           --------------^^^^^^^^^^^
   |                           |
   |                           expected lifetime parameter
   |
  ::: compiler/rustc_baked_icu_data/src/lib.rs:33:5
   |
33 |     impl_data_provider!(BakedDataProvider);
   |     -------------------------------------- in this macro invocation
   |
note: the lint level is defined here
  --> <crate attribute>:1:9
   |
 1 | #![warn(rust_2018_idioms)]
   |         ^^^^^^^^^^^^^^^^
   = note: `#[warn(elided_lifetimes_in_paths)]` implied by `#[warn(rust_2018_idioms)]`
   = note: this warning originates in the macro `impl_list_and_v1` which comes from the expansion of the macro `impl_data_provider` (in Nightly builds, run with -Z macro-backtrace for more info)
help: indicate the anonymous lifetime
   |
34 |             fn load(&self, req: icu_provider::DataRequest<'_>) -> Result<icu_provider::DataResponse<icu_list::provider::ListAndV1>, icu_provider::DataError> {
   |                                                          ++++

 Documenting rustc_windows_rc v0.0.0 (/checkout/compiler/rustc_windows_rc)
[RUSTC-TIMING] rustc_ast test:false 6.985
    Checking rustc_errors v0.0.0 (/checkout/compiler/rustc_errors)
---
warning: rustc_llvm@0.0.0: Inherited flag "-fembed-bitcode=all" is not supported by the currently used CC
warning: rustc_llvm@0.0.0: Inherited flag "-fembed-bitcode=all" is not supported by the currently used CC
warning: rustc_llvm@0.0.0: Inherited flag "-fembed-bitcode=all" is not supported by the currently used CC
warning: rustc_llvm@0.0.0: Inherited flag "-fembed-bitcode=all" is not supported by the currently used CC
Command `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo doc --target x86_64-unknown-linux-gnu -Zbinary-dep-depinfo -j 8 -Zroot-dir=/checkout --locked --color=always --profile=release --features 'jemalloc llvm rustc' --manifest-path /checkout/compiler/rustc/Cargo.toml -Zskip-rustdoc-fingerprint --no-deps -Zrustdoc-map -p rustc-main -p rustc_abi -p rustc_arena -p rustc_ast -p rustc_ast_ir -p rustc_ast_lowering -p rustc_ast_passes -p rustc_ast_pretty -p rustc_attr_parsing -p rustc_baked_icu_data -p rustc_borrowck -p rustc_builtin_macros -p rustc_codegen_llvm -p rustc_codegen_ssa -p rustc_const_eval -p rustc_data_structures -p rustc_driver -p rustc_driver_impl -p rustc_error_codes -p rustc_error_messages -p rustc_errors -p rustc_expand -p rustc_feature -p rustc_fs_util -p rustc_graphviz -p rustc_hashes -p rustc_hir -p rustc_hir_analysis -p rustc_hir_id -p rustc_hir_pretty -p rustc_hir_typeck -p rustc_incremental -p rustc_index -p rustc_index_macros -p rustc_infer -p rustc_interface -p rustc_lexer -p rustc_lint -p rustc_lint_defs -p rustc_llvm -p rustc_log -p rustc_macros -p rustc_metadata -p rustc_middle -p rustc_mir_build -p rustc_mir_dataflow -p rustc_mir_transform -p rustc_monomorphize -p rustc_next_trait_solver -p rustc_parse -p rustc_parse_format -p rustc_passes -p rustc_pattern_analysis -p rustc_privacy -p rustc_proc_macro -p rustc_public -p rustc_public_bridge -p rustc_query_impl -p rustc_resolve -p rustc_sanitizers -p rustc_serialize -p rustc_session -p rustc_span -p rustc_symbol_mangling -p rustc_target -p rustc_thread_pool -p rustc_trait_selection -p rustc_traits -p rustc_transmute -p rustc_ty_utils -p rustc_type_ir -p rustc_type_ir_macros -p rustc_windows_rc [workdir=/checkout]` failed with exit code 101
Created at: src/bootstrap/src/core/build_steps/doc.rs:916:25
Executed at: src/bootstrap/src/core/build_steps/doc.rs:977:26

--- BACKTRACE vvv
   0: <bootstrap::utils::exec::DeferredCommand>::finish_process
             at /checkout/src/bootstrap/src/utils/exec.rs:939:17
   1: <bootstrap::utils::exec::DeferredCommand>::wait_for_output::<&bootstrap::utils::exec::ExecutionContext>
             at /checkout/src/bootstrap/src/utils/exec.rs:831:21
   2: <bootstrap::utils::exec::ExecutionContext>::run
             at /checkout/src/bootstrap/src/utils/exec.rs:741:45
   3: <bootstrap::utils::exec::BootstrapCommand>::run::<&bootstrap::core::builder::Builder>
             at /checkout/src/bootstrap/src/utils/exec.rs:339:27
   4: <bootstrap::core::build_steps::doc::Rustc as bootstrap::core::builder::Step>::run
             at /checkout/src/bootstrap/src/core/build_steps/doc.rs:977:26
   5: <bootstrap::core::builder::Builder>::ensure::<bootstrap::core::build_steps::doc::Rustc>
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1596:36
   6: <bootstrap::core::build_steps::doc::Rustc as bootstrap::core::builder::Step>::make_run
             at /checkout/src/bootstrap/src/core/build_steps/doc.rs:886:21
   7: <bootstrap::core::builder::StepDescription>::maybe_run
             at /checkout/src/bootstrap/src/core/builder/mod.rs:476:13
   8: bootstrap::core::builder::cli_paths::match_paths_to_steps_and_run
             at /checkout/src/bootstrap/src/core/builder/cli_paths.rs:141:22
   9: <bootstrap::core::builder::Builder>::run_step_descriptions
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1139:9
---
  12: <bootstrap::core::builder::Builder>::ensure::<bootstrap::core::build_steps::dist::Docs>
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1596:36
  13: <bootstrap::core::build_steps::dist::Docs as bootstrap::core::builder::Step>::make_run
             at /checkout/src/bootstrap/src/core/build_steps/dist.rs:79:21
  14: <bootstrap::core::builder::StepDescription>::maybe_run
             at /checkout/src/bootstrap/src/core/builder/mod.rs:476:13
  15: bootstrap::core::builder::cli_paths::match_paths_to_steps_and_run
             at /checkout/src/bootstrap/src/core/builder/cli_paths.rs:141:22
  16: <bootstrap::core::builder::Builder>::run_step_descriptions
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1139:9
  17: <bootstrap::core::builder::Builder>::execute_cli
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1118:14
  18: <bootstrap::Build>::build
             at /checkout/src/bootstrap/src/lib.rs:803:25
  19: bootstrap::main
             at /checkout/src/bootstrap/src/bin/main.rs:130:11
  20: <fn() as core::ops::function::FnOnce<()>>::call_once
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/core/src/ops/function.rs:250:5
  21: std::sys::backtrace::__rust_begin_short_backtrace::<fn(), ()>
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/sys/backtrace.rs:166:18
  22: std::rt::lang_start::<()>::{closure#0}
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/rt.rs:206:18
  23: <&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe as core::ops::function::FnOnce<()>>::call_once
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/core/src/ops/function.rs:287:21
  24: std::panicking::catch_unwind::do_call::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/panicking.rs:581:40
  25: std::panicking::catch_unwind::<i32, &dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe>
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/panicking.rs:544:19
  26: std::panic::catch_unwind::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/panic.rs:359:14
  27: std::rt::lang_start_internal::{closure#0}
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/rt.rs:175:24
  28: std::panicking::catch_unwind::do_call::<std::rt::lang_start_internal::{closure#0}, isize>
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/panicking.rs:581:40
---
  34: __libc_start_main
  35: <unknown>


Command has failed. Rerun with -v to see more details.
Bootstrap failed while executing `dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu --include-default-paths build-manifest bootstrap`
Build completed unsuccessfully in 0:38:05
  local time: Tue Jun  9 20:46:13 UTC 2026
  network time: Tue, 09 Jun 2026 20:46:13 GMT
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"

rust-bors · 2026-06-09T20:47:12Z

💔 Test for b954412 failed: CI. Failed job:

auto - dist-x86_64-linux-alt (web logs, enhanced plaintext logs)

rust-bors · 2026-06-09T20:52:37Z

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

traviscross and others added 30 commits May 20, 2026 20:34

Remove driver_lint_caps

9d7b0e4

It was only used by rustdoc and doesn't seem like it was necessary there. No tests fail at least.

Change type of async context parameter after state transform.

f60cb02

Bless type sizes tests.

b7e26ac

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

fix doc for unicode normalization faq on casefold APIs

d370f0d

Report duplicate relaxed bounds during ast lowering

16aa9d0

Allow elided_lifetimes_in_paths in doctests for rustc_backed_icu_data

e1491b9

Make Literal::byte_character_value work with bytes as well

e27598e

Fix async drop glue for Box<T>

2bc5e90

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

Update to ar_archive_writer v0.5.2

d3e4bfb

Add snapshot test for proc macro decls array

6be73e2

Make proc_macro Client untyped

67c4850

Incorrect types can't cause unsafety and making it untyped will make it easier to get rid of the ProcMacro enum in the proc-macro ABI.

Remove ProcMacro enum from proc macro ABI

7edb1c0

Instead encode this information in the crate metadata. This helps shrink the proc-macro ABI to just the parts necessary for transmitting raw bytes to perform RPC on top of.

Fix rust-analyzer-proc-macro-srv

993bda7

add test for matches

ca657d2

Rollup merge of rust-lang#157668 - jdonszelmann:matches-must-match-ex…

15f07cc

…haustively, r=lqd Add test for matches in `rustc_must_match_exhaustively` r? @lcnr

rust-bors Bot added the rollup A PR which is a rollup label 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

rust-bors Bot mentioned this pull request Jun 9, 2026

Make trait refs & assoc ty paths properly induce trait object lifetime defaults #129543

Merged

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

jhpratt mentioned this pull request Jun 9, 2026

Remove driver_lint_caps #152852

Open

jhpratt closed this Jun 9, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label 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

jhpratt deleted the rollup-Y7coMpH branch June 9, 2026 20:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 18 pull requests#157679

Rollup of 18 pull requests#157679
jhpratt wants to merge 48 commits into
rust-lang:mainfrom
jhpratt:rollup-Y7coMpH

jhpratt commented Jun 9, 2026

Uh oh!

jhpratt commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer 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!

19 participants

Uh oh!

Conversation

jhpratt commented Jun 9, 2026

Uh oh!

jhpratt commented Jun 9, 2026

Uh oh!

rust-bors Bot commented Jun 9, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer 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!

19 participants