Skip to content

Rollup of 8 pull requests - #165808

Merged
rust-bors[bot] merged 22 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-3k5ntMd
Nov 11, 2026
Merged

rust-bors[bot] merged 22 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-3k5ntMd

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

mejrs and others added 22 commits October 27, 2026 10:50
Co-authored-by: alexey semenyuk <alexsemenyuk88@gmail.com>
Co-authored-by: Kevin Reid <kpreid@switchb.org>
Co-authored-by: 许杰友 Jieyou Xu (Joe) <39484203+jieyouxu@users.noreply.github.com>
Co-authored-by: Tim (Theemathas) Chirananthavat <theemathas@gmail.com>
which was renamed and started taking an LibraryOptionsContext argument
in llvm/llvm-project#239919
Co-authored-by: Josh Stone <cuviper@gmail.com>
"appendex" -> "appendix".

Signed-off-by: Hardik Kumar <hardikxk@gmail.com>
Co-authored-by: Josh Stone <cuviper@gmail.com>
See <rust-lang#165796>. This debuginfo
test is flaky for ARM64 MSVC.
Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>
Add relnotes for 1.100

r? cuviper

cc @rust-lang/release
…,fmease

Support underscore as associated const name in inherent impls

This PR doesn't change the current behavior of the `dead_code` lint for unused associated consts with underscore-prefixed names and treats associated consts named `_` consistently.

There might still be some places that should've been changed to use `named_items_in_definition_order()` instead of `in_definition_order()`, though I'm not quite sure.

[The RFC](https://github.com/dtolnay/rfcs/blob/assocunderscore/text/0000-associated-const-underscore.md#reference-level-explanation) does not propose const underscore inside traits or trait impls, so this PR only implements support for const underscore in inherent impls.

Unresolved questions:
- Whether to lint `impl Private { pub const _: Private = Private; }`, where the visibility qualifier here has no effect. It seems like there wasn't any disagreement on linting this, though what's proposed in the RFC currently diverges from that: [RFC: Associated const underscore](https://github.com/dtolnay/rfcs/blob/assocunderscore/text/0000-associated-const-underscore.md#reference-level-explanation).

Tracking:
- rust-lang#158944
…ouwer,GuillaumeGomez

Properly feature gate doc(rust_logo)

fixes rust-lang#161984

It's a breaking change, technically. I didn't find it in the crater rollup, but will rerun just in case.
…nFlags, r=nikic

Update call to llvm::codegen::InitTargetOptionsFromCodeGenFlags

which was renamed and started taking a LibraryOptionsContext argument in llvm/llvm-project#239919
Bail out ill-formed aliases when assembling trait object bounds candidates

Fixes rust-lang#155761

r? adwinwhite
…r=tshepang

docs: Fix a typo in rustc-dev-guide [NFC]

"appendex" -> "appendix".
…cdb-basic-stepping, r=Enselic

Disable flaky `tests/debuginfo/basic-stepping.rs` on aarch64 msvc

See <rust-lang#165796>. This debuginfo test is flaky for aarch64 msvc.

### History

- Test added in rust-lang#153840
- Removed `ignore-aarch64` in rust-lang#153877
- Seems that we started getting failures soon after, e.g. rust-lang#153935 (comment)
- rust-lang#153939 also wanted to add `ignore-aarch64-pc-windows-msvc` but was closed.
…ercote

Add a regression test for fixed next-solver ICE

Closes rust-lang#155035, which has been fixed already(cc rust-lang#155035 (comment))
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Nov 11, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 11, 2026
@rustbot rustbot added T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Nov 11, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5 force

@rust-bors

rust-bors Bot commented Nov 11, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 229c554 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors 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 Nov 11, 2026
@rust-bors

This comment has been minimized.

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job test-pr-check-1 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 rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 11, 2026
@rust-bors

rust-bors Bot commented Nov 11, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 22m
Pushing e88737b to main...

@rust-bors
rust-bors Bot merged commit e88737b into rust-lang:main Nov 11, 2026
8 of 15 checks passed
@rustbot rustbot added this to the 1.102.0 milestone Nov 11, 2026
@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 9de7469 (parent) -> e88737b (this PR)

Test differences

Show 66 test diffs

Stage 1

  • [crashes] tests/crashes/155761-1.rs: pass -> [missing] (J0)
  • [rustdoc-html] tests/rustdoc-html/associated-const-underscore.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/associated-const-underscore.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-consts/associated-const-underscore-dead-code.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-consts/associated-const-underscore-fail.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-consts/associated-const-underscore-visibility.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-consts/associated-const-underscore.rs: [missing] -> pass (J1)
  • [ui] tests/ui/feature-gates/feature-gate-associated-const-underscore.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/ill-formed-proj-bound-on-trait-obj-no-ice.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/object-projection-with-unsatisfied-bound-2.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/object-projection-with-unsatisfied-bound-2.rs#next: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/associated-consts/associated-const-underscore-dead-code.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/associated-consts/associated-const-underscore-fail.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/associated-consts/associated-const-underscore-visibility.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/associated-consts/associated-const-underscore.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/feature-gates/feature-gate-associated-const-underscore.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/traits/next-solver/ill-formed-proj-bound-on-trait-obj-no-ice.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/traits/next-solver/object-projection-with-unsatisfied-bound-2.rs#current: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/traits/next-solver/object-projection-with-unsatisfied-bound-2.rs#next: [missing] -> pass (J2)

Stage 2

  • [debuginfo-cdb] tests/debuginfo/basic-stepping.rs#maximally-steppable: pass -> ignore (ignored when the target is aarch64-pc-windows-msvc) (J3)
  • [debuginfo-cdb] tests/debuginfo/basic-stepping.rs#opt-level-0: pass -> ignore (ignored when the target is aarch64-pc-windows-msvc) (J3)
  • [ui] tests/ui/associated-consts/associated-const-underscore-dead-code.rs: [missing] -> pass (J4)
  • [ui] tests/ui/associated-consts/associated-const-underscore-fail.rs: [missing] -> pass (J4)
  • [ui] tests/ui/associated-consts/associated-const-underscore-visibility.rs: [missing] -> pass (J4)
  • [ui] tests/ui/associated-consts/associated-const-underscore.rs: [missing] -> pass (J4)
  • [ui] tests/ui/feature-gates/feature-gate-associated-const-underscore.rs: [missing] -> pass (J4)
  • [ui] tests/ui/traits/next-solver/ill-formed-proj-bound-on-trait-obj-no-ice.rs: [missing] -> pass (J4)
  • [ui] tests/ui/traits/next-solver/object-projection-with-unsatisfied-bound-2.rs#current: [missing] -> pass (J4)
  • [ui] tests/ui/traits/next-solver/object-projection-with-unsatisfied-bound-2.rs#next: [missing] -> pass (J4)
  • [rustdoc-html] tests/rustdoc-html/associated-const-underscore.rs: [missing] -> pass (J5)
  • [rustdoc-json] tests/rustdoc-json/associated-const-underscore.rs: [missing] -> pass (J5)
  • [crashes] tests/crashes/155761-1.rs: pass -> [missing] (J6)

Additionally, 34 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard e88737b98536eae309f98e207b8af6a2cafa0350 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. optional-test-x86_64-gnu-autodiff: 34m 1s -> 1h 1m (+81.0%)
  2. test-x86_64-gnu-gcc-core-tests: 10m 50s -> 17m 54s (+65.2%)
  3. test-x86_64-msvc-ext3: 1h 11m -> 1h 56m (+62.0%)
  4. test-various: 1h 30m -> 2h 24m (+59.0%)
  5. test-x86_64-mingw-1: 3h 9m -> 1h 42m (-45.9%)
  6. dist-powerpc-linux: 1h 5m -> 1h 34m (+43.8%)
  7. dist-armhf-linux: 1h 7m -> 1h 36m (+43.1%)
  8. dist-arm-linux-gnueabi: 1h 7m -> 1h 34m (+41.4%)
  9. dist-aarch64-apple: 2h 24m -> 3h 18m (+37.2%)
  10. test-aarch64-apple-1: 2h 39m -> 1h 40m (-37.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-bors

rust-bors Bot commented Nov 11, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#165522 Add relnotes for 1.100 184473a30ba712a70290f282d1aff34aa71d1ca1
(link)
#158970 Support underscore as associated const name in inherent imp… 312bd0980b2b6ebcd3dc88cffe3751b7c48f3a5b
(link)
#164582 Properly feature gate doc(rust_logo) 21ea64e46660810ba8adc7a2be1a34e77e5672f4
(link)
#165680 Update call to llvm::codegen::InitTargetOptionsFromCodeGenF… 5a8d2aadb46bfb93ba30d5849d4a5853971a9513
(link)
#165768 Bail out ill-formed aliases when assembling trait object bo… 845696a254eb01bb7de75212f44bcbb9b06dbfff
(link)
#165776 docs: Fix a typo in rustc-dev-guide [NFC] 988725741b9cb8b187f8a46cc0286707a7e44259
(link)
#165797 Disable flaky tests/debuginfo/basic-stepping.rs on aarch6… fb312364fb31b86c3a63da4cee9362aeae008b6d
(link)
#165798 Add a regression test for fixed next-solver ICE 2c17a5f36dd031fc9419176199cd5e8cf8c22bcc
(link)

parent commit: 9de7469383

In the case of a perf regression, run the following command with the SHAs of each PR you suspect might be the cause: @rust-timer triage $SHA $SHA $SHA..., or run @rust-timer triage all to benchmark all rollup members.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e88737b): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary 1.3%, secondary -0.5%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
1.3% [1.3%, 1.3%] 1
Regressions ❌
(secondary)
2.6% [2.2%, 3.0%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-6.6% [-6.6%, -6.6%] 1
All ❌✅ (primary) 1.3% [1.3%, 1.3%] 1

Cycles

Results (secondary 2.8%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
4.4% [2.3%, 6.8%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.5% [-3.5%, -3.5%] 1
All ❌✅ (primary) - - 0

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 483.908s -> 484.585s (0.14%)
Artifact size: 406.45 MiB -> 406.42 MiB (-0.01%)

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Nov 11, 2026
…esleywiser

Adjust `unsized.rs` debuginfo test expected output for cdb `10.0.28000.2957`

This was a cdb test that was failing locally when I updated Windows SDK to `10.0.28000.2957` (and thus cdb and WinDbg).

Currently our Windows CI seems to use Windows SDKs around `10.0.26100.*`. See example run:

- rust-lang#165808
- => https://github.com/rust-lang/rust/actions/runs/43010199577
- => https://github.com/rust-lang/rust/actions/runs/43010199577/job/130488011527
- => Runner image `windows-2025-vs2026 20261103.298.1`
- => https://github.com/actions/runner-images/blob/win25-vs2026/20261103.298/images/windows/Windows2025-VS2026-Readme.md
- => `10.0.26100.33674`

Seems that for whatever reason eventual visualizations for `c` and `_box` changed between these cdb (WinDbg) versions. For

```rs
let c: &Foo<dyn std::fmt::Debug> = &Foo { value: 7i32 };
```

the `10.0.26100.*` series seem to output e.g.

```
//@ cdb-check:c                [Type: ref$<unsized::Foo<dyn$<core::fmt::Debug> > >]
//@ cdb-check:    [+0x000] pointer          : 0x[...] [Type: unsized::Foo<dyn$<core::fmt::Debug> > *]
//@ cdb-check:    [...] vtable           : 0x[...] [Type: unsigned [...]int[...] (*)[4]]
```

but `10.0.28000.2957` output changed to a single line e.g.

```
              c                : 7 [Type: i32 (derived from ref$<unsized::Foo<dyn$<core::fmt::Debug> > >)]
```

So likely one of:

- Default visualizers got updated
- WinDbg internals changed
- cdb <-> WinDbg engine interactions changed

I cannot find cdb/WinDbg changelogs anywhere for these specific Windows SDK versions, so the best I can do is use `10.0.28000.2957` output as new expected output and gate this test on a minimum cdb version of `10.0.28000.2957`.

This of course means that, before our GHA windows runner images update to a Windows SDK that's at least `10.0.28000.2957` (and thus cdb since they're distributed and versioned together), this test will not run in CI.
rust-bors Bot pushed a commit that referenced this pull request Nov 11, 2026
Rollup merge of #165815 - jieyouxu:jieyouxu/fix-unsized, r=wesleywiser

Adjust `unsized.rs` debuginfo test expected output for cdb `10.0.28000.2957`

This was a cdb test that was failing locally when I updated Windows SDK to `10.0.28000.2957` (and thus cdb and WinDbg).

Currently our Windows CI seems to use Windows SDKs around `10.0.26100.*`. See example run:

- #165808
- => https://github.com/rust-lang/rust/actions/runs/43010199577
- => https://github.com/rust-lang/rust/actions/runs/43010199577/job/130488011527
- => Runner image `windows-2025-vs2026 20261103.298.1`
- => https://github.com/actions/runner-images/blob/win25-vs2026/20261103.298/images/windows/Windows2025-VS2026-Readme.md
- => `10.0.26100.33674`

Seems that for whatever reason eventual visualizations for `c` and `_box` changed between these cdb (WinDbg) versions. For

```rs
let c: &Foo<dyn std::fmt::Debug> = &Foo { value: 7i32 };
```

the `10.0.26100.*` series seem to output e.g.

```
//@ cdb-check:c                [Type: ref$<unsized::Foo<dyn$<core::fmt::Debug> > >]
//@ cdb-check:    [+0x000] pointer          : 0x[...] [Type: unsized::Foo<dyn$<core::fmt::Debug> > *]
//@ cdb-check:    [...] vtable           : 0x[...] [Type: unsigned [...]int[...] (*)[4]]
```

but `10.0.28000.2957` output changed to a single line e.g.

```
              c                : 7 [Type: i32 (derived from ref$<unsized::Foo<dyn$<core::fmt::Debug> > >)]
```

So likely one of:

- Default visualizers got updated
- WinDbg internals changed
- cdb <-> WinDbg engine interactions changed

I cannot find cdb/WinDbg changelogs anywhere for these specific Windows SDK versions, so the best I can do is use `10.0.28000.2957` output as new expected output and gate this test on a minimum cdb version of `10.0.28000.2957`.

This of course means that, before our GHA windows runner images update to a Windows SDK that's at least `10.0.28000.2957` (and thus cdb since they're distributed and versioned together), this test will not run in CI.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.