Rollup of 23 pull requests by jhpratt · Pull Request #157726 · rust-lang/rust

jhpratt · 2026-06-10T19:27:02Z

Successful merges:

traits: Allow escaping self types in ExistentialTraitRef::with_self_ty #157280 (traits: Allow escaping self types in ExistentialTraitRef::with_self_ty)
Fix post-monomorphization error note race in the parallel frontend #157282 (Fix post-monomorphization error note race in the parallel frontend)
Make the retained dep graph deterministic under the parallel frontend #157352 (Make the retained dep graph deterministic under the parallel frontend)
Emit error for unused target expression in glob and list delegations #157601 (Emit error for unused target expression in glob and list delegations)
Update browser-ui-test version to 0.24.0 #157611 (Update browser-ui-test version to 0.24.0)
Add a strategy FnMut to inject behavior into the flush cycle #157620 (Add a strategy FnMut to inject behavior into the flush cycle)
Windows TLS - Only register the atexit hook when cleanup can be unloaded #157645 (Windows TLS - Only register the atexit hook when cleanup can be unloaded)
Start using comptime for reflection intrinsics and their wrapper functions #157647 (Start using comptime for reflection intrinsics and their wrapper functions)
resolve: Partially revert "Remove a special case for dummy imports" #157719 (resolve: Partially revert "Remove a special case for dummy imports")
fix-155516: Don't suggest wrong unwrap expect #156497 (fix-155516: Don't suggest wrong unwrap expect)
Support defaults for static EIIs #156583 (Support defaults for static EIIs)
Ensure inferred let pattern types are well-formed #157013 (Ensure inferred let pattern types are well-formed)
borrowck: avoid ICE describing fields on generic params #157230 (borrowck: avoid ICE describing fields on generic params)
platform support: add SNaN erratum to MIPS targets #157288 (platform support: add SNaN erratum to MIPS targets)
compiletest: ignore SVG y offset in by-lines comparison #157350 (compiletest: ignore SVG y offset in by-lines comparison)
Add or_try_* variants for HashMap and BTreeMap Entry APIs #157355 (Add or_try_* variants for HashMap and BTreeMap Entry APIs)
Add #[rustc_dump_generics] attribute #157384 (Add #[rustc_dump_generics] attribute)
Fix parser error recovery treating 'dyn' as a strict keyword in Rust 2015 when used in dyn + dyn #157577 (Fix parser error recovery treating 'dyn' as a strict keyword in Rust 2015 when used in dyn + dyn)
Rename errors.rs file to diagnostics.rs (4/N) #157670 (Rename errors.rs file to diagnostics.rs (4/N))
Move symbol hiding code to a new file #157691 (Move symbol hiding code to a new file)
Add more tests that exercise the well-formedness checking of lazy type aliases #157697 (Add more tests that exercise the well-formedness checking of lazy type aliases)
Rename errors.rs file to diagnostics.rs (5/N) #157700 (Rename errors.rs file to diagnostics.rs (5/N))
Fix doc link to Instant sub in saturating caveat #157703 (Fix doc link to Instant sub in saturating caveat)

Failed merges:

Arg splat experiment - hir FnDecl impl #157699 (Arg splat experiment - hir FnDecl impl)

WF-checking walks through higher-ranked binders without instantiating them, so a `dyn Trait` nested inside a `for<'a>` bound reaches the `ty::Dynamic` arm of `WfPredicates::visit_ty` while still carrying escaping bound vars. Feeding that type into `ExistentialTraitRef::with_self_ty` violated its no-escaping-self precondition and tripped the assertion that guards it. The trait ref built there is only used to read off `ConstArgHasType` clauses, which constrain the trait's own const arguments and never mention the `Self` type. Substitute a fresh placeholder self type when the real one escapes: the assertion holds and the const-argument check is still performed. Re-enable the `with_self_ty` debug assertion now that its precondition is upheld.

One test covers the original ICE (a `dyn Trait` nested in a `for<'a>` bound, distilled from itertools). The other locks in that a const argument on such a nested `dyn` is still type-checked, so the placeholder-self-type fix cannot silently regress into dropping the `ConstArgHasType` check.

Doc typo

The in-memory dep graph kept for `-Zquery-dep-graph` is built by `GraphEncoder::record`, which pushed each node using `try_lock` and silently dropped the node when the lock was contended. Single-threaded the only contention is a query forced re-entrantly from within `with_retained_dep_graph`, so dropping was harmless. Under the parallel frontend several encoder threads record nodes at the same time, so a contended `try_lock` dropped nodes and edges at random, leaving the retained graph nondeterministic and making the dep-graph ui tests, which assert on its contents, fail intermittently. Remove that reentrancy in `check_paths`: read the graph into owned results while the lock is held, then emit the diagnostics afterwards. The only query forced inside the old closure was `def_path_str` (for the error messages), which can create dep nodes and re-enter the encoder; doing the emission after the lock is released means `record` never re-enters while the lock is held. `record` can then block on the lock unconditionally instead of using `try_lock`, so concurrent encoders never drop a node or edge. This only affects compilation with `-Zquery-dep-graph`; with the flag off the retained graph is absent and nothing changes.

These tests assert on the contents of the retained dep graph, which is now built deterministically under the parallel frontend, so they no longer need to be ignored there. Replace the ignore-parallel-frontend directives with blank lines rather than deleting them, so the following line numbers stay the same and the expected output is unchanged.

WF-checking can reach ExistentialTraitRef::with_self_ty with a dyn principal that still carries escaping bound vars, e.g. a dyn nested in a for<'a> bound, which tripped the debug assertion forbidding escaping self types and ICEd when compiling itertools. Building such a trait ref is fine: escaping bound vars are caught where it is actually used. Remove the assertion rather than working around it, which lets the WF visitor pass the type through unchanged and drops the placeholder-self-type detour.

…s.rs`

…stics.rs`

…e aliases

…nostics.rs`

…c/diagnostics.rs`

…apin Fix doc link to Instant sub in saturating caveat The `sub` link in the caveat about saturating subtraction for `Instant` was linking to the wrong implementation of `sub`. On https://doc.rust-lang.org/std/time/struct.Instant.html it was linking to `Instant - Duration` which in fact *is not saturating*, and *will* panic. It should link to `Instant - Instant`.

jhpratt · 2026-06-10T19:27:16Z

@bors r+ rollup=never p=5

rust-bors · 2026-06-10T19:27:19Z

📌 Commit 8367944 has been approved by jhpratt

It is now in the queue for this repository.

Rollup of 23 pull requests Successful merges: - #157280 (traits: Allow escaping self types in ExistentialTraitRef::with_self_ty) - #157282 (Fix post-monomorphization error note race in the parallel frontend) - #157352 (Make the retained dep graph deterministic under the parallel frontend) - #157601 (Emit error for unused target expression in glob and list delegations) - #157611 (Update `browser-ui-test` version to `0.24.0`) - #157620 (Add a strategy FnMut to inject behavior into the flush cycle) - #157645 (Windows TLS - Only register the `atexit` hook when `cleanup` can be unloaded) - #157647 (Start using comptime for reflection intrinsics and their wrapper functions) - #157719 (resolve: Partially revert "Remove a special case for dummy imports") - #156497 (fix-155516: Don't suggest wrong unwrap expect) - #156583 (Support defaults for static EIIs) - #157013 (Ensure inferred let pattern types are well-formed) - #157230 (borrowck: avoid ICE describing fields on generic params) - #157288 (platform support: add SNaN erratum to MIPS targets) - #157350 (compiletest: ignore SVG `y` offset in by-lines comparison) - #157355 (Add `or_try_*` variants for `HashMap` and `BTreeMap` Entry APIs) - #157384 (Add `#[rustc_dump_generics]` attribute) - #157577 (Fix parser error recovery treating 'dyn' as a strict keyword in Rust 2015 when used in `dyn + dyn`) - #157670 (Rename `errors.rs` file to `diagnostics.rs` (4/N)) - #157691 (Move symbol hiding code to a new file) - #157697 (Add more tests that exercise the well-formedness checking of lazy type aliases) - #157700 (Rename `errors.rs` file to `diagnostics.rs` (5/N)) - #157703 (Fix doc link to Instant sub in saturating caveat) Failed merges: - #157699 (Arg splat experiment - hir FnDecl impl)

rust-bors · 2026-06-10T21:02:56Z

💔 Test for 08d9006 failed: CI. Failed job:

auto - dist-ohos-aarch64 (web logs, enhanced plaintext logs)

jhpratt · 2026-06-10T21:04:07Z

@bors retry

rust-log-analyzer · 2026-06-10T21:08:05Z

A job failed! Check out the build log: (web) (plain enhanced) (plain)

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

rust-bors · 2026-06-11T00:54:05Z

⌛ Testing commit 8367944 with merge 7c53a80...

Workflow: https://github.com/rust-lang/rust/actions/runs/27316407702

Rollup of 23 pull requests Successful merges: - #157280 (traits: Allow escaping self types in ExistentialTraitRef::with_self_ty) - #157282 (Fix post-monomorphization error note race in the parallel frontend) - #157352 (Make the retained dep graph deterministic under the parallel frontend) - #157601 (Emit error for unused target expression in glob and list delegations) - #157611 (Update `browser-ui-test` version to `0.24.0`) - #157620 (Add a strategy FnMut to inject behavior into the flush cycle) - #157645 (Windows TLS - Only register the `atexit` hook when `cleanup` can be unloaded) - #157647 (Start using comptime for reflection intrinsics and their wrapper functions) - #157719 (resolve: Partially revert "Remove a special case for dummy imports") - #156497 (fix-155516: Don't suggest wrong unwrap expect) - #156583 (Support defaults for static EIIs) - #157013 (Ensure inferred let pattern types are well-formed) - #157230 (borrowck: avoid ICE describing fields on generic params) - #157288 (platform support: add SNaN erratum to MIPS targets) - #157350 (compiletest: ignore SVG `y` offset in by-lines comparison) - #157355 (Add `or_try_*` variants for `HashMap` and `BTreeMap` Entry APIs) - #157384 (Add `#[rustc_dump_generics]` attribute) - #157577 (Fix parser error recovery treating 'dyn' as a strict keyword in Rust 2015 when used in `dyn + dyn`) - #157670 (Rename `errors.rs` file to `diagnostics.rs` (4/N)) - #157691 (Move symbol hiding code to a new file) - #157697 (Add more tests that exercise the well-formedness checking of lazy type aliases) - #157700 (Rename `errors.rs` file to `diagnostics.rs` (5/N)) - #157703 (Fix doc link to Instant sub in saturating caveat) Failed merges: - #157699 (Arg splat experiment - hir FnDecl impl)

s7tya and others added 30 commits May 29, 2026 04:37

Ensure inferred let pattern types are well-formed

d780821

Don't suggest wrong unwrap expect

9633071

borrowck: avoid ICE describing fields on generic params

2314457

Add or_try_* variants for HashMap Entry API

de37dfd

Doc typo

platform support: add SNaN erratum to MIPS targets

92175ed

Use field-index fallback for undescribed fields

5a7ca04

Attribute post-monomorphization error notes by emitting thread

c1cd236

Re-enable parallel frontend tests for post-monomorphization errors

2e128c7

Update browser-ui-test version to 0.24.0

3ecbb39

Update nodejs version used in CI to 24.15.0

0d980a5

Support defaults for static EIIs

1e125ce

Add a regression test

e069f47

Mark trait_info_of as comptime and adjust the compiler to handle it

947a5b6

Mark more reflection things as comptime

b3c6e82

Fix parser error recovery for 'dyn' in Rust 2015

5bc21b1

Implement or_try_* methods on BTreeMap Entry API

c010b25

Add flush strategy to allow observing bytes before they are flushed.

6324b4a

Move symbol hiding code to a new file

8ee1dfa

Rename rustc_expand/src/errors.rs into `rustc_expand/src/diagnostic…

2a5673f

…s.rs`

Rename rustc_metadata/src/errors.rs into `rustc_metadata/src/diagno…

96eb195

…stics.rs`

Add more tests that exercise the well-formedness checking of lazy typ…

32a2f0c

…e aliases

Rename rustc_mir_build/src/errors.rs into `rustc_mir_build/src/diag…

00ac562

…nostics.rs`

Rename rustc_mir_dataflow/src/errors.rs into `rustc_mir_dataflow/sr…

b679cbd

…c/diagnostics.rs`

Emit error for unused target expression in glob and list delegations

6708111

Fix doc link to Instant sub in saturating caveat

6a0f2d4

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

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

Build the dep-graph reverse index lazily, per DepKind #157319

Open

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 23 pull requests#157726

Rollup of 23 pull requests#157726
jhpratt wants to merge 59 commits into
rust-lang:mainfrom
jhpratt:rollup-UIfbKIF

jhpratt commented Jun 10, 2026

Uh oh!

jhpratt commented Jun 10, 2026

Uh oh!

rust-bors Bot commented Jun 10, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jun 10, 2026

Uh oh!

jhpratt commented Jun 10, 2026

Uh oh!

rust-log-analyzer commented Jun 10, 2026

Uh oh!

rust-bors Bot commented Jun 11, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Uh oh!

Conversation

jhpratt commented Jun 10, 2026

Uh oh!

jhpratt commented Jun 10, 2026

Uh oh!

rust-bors Bot commented Jun 10, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jun 10, 2026

Uh oh!

jhpratt commented Jun 10, 2026

Uh oh!

rust-log-analyzer commented Jun 10, 2026

Uh oh!

rust-bors Bot commented Jun 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

rust-bors Bot commented Jun 11, 2026 •

edited

Loading