Rollup of 8 pull requests by jhpratt · Pull Request #163236 · rust-lang/rust

jhpratt · 2026-09-23T23:57:06Z

Successful merges:

fix quadratic naming of duplicate sidebar links #162976 (fix quadratic naming of duplicate sidebar links)
Enable EII tests for cg_gcc #163222 (Enable EII tests for cg_gcc)
Remove StashKey::AssociatedTypeSuggestion #162942 (Remove StashKey::AssociatedTypeSuggestion)
Don't suggest std:: rustfix paths in #![no_std] crates #163096 (Don't suggest std:: rustfix paths in #![no_std] crates)
Mark std::os::wasip2 with correct doc-cfgs, mark as unstable #163110 (Mark std::os::wasip2 with correct doc-cfgs, mark as unstable)
properly decrement available_depth on cycles and provisional cache hits #163185 (properly decrement available_depth on cycles and provisional cache hits)
revert r14 register names for arm #163214 (revert r14 register names for arm)
miri subtree update #163226 (miri subtree update)

…+activate

VSCode settings: disable diagnostics as RA shows many false positives

This updates the rust-version file to 88638df.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Previous upstream ref: rust-lang/rust@feaadee New upstream ref: rust-lang/rust@88638df Filtered ref: rust-lang/miri@a3ebd7e Upstream diff: rust-lang/rust@feaadee...88638df This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

Add `miri.toml` config file for `./miri` script

fix #[path] in doctest

…tfix

Currently it's used in a really hacky way: a diagnostic with an empty message and some suggestions is stashed. Later on it might be retrieved and its suggestions extracted. It uses `Level::Allow` so that it isn't printed by `emit_stashed_diagnostics` at shutdown if it hasn't been retrieved. This isn't a normal stashed diagnostic, more just a case of "save some information that might be useful for diagnostics later". We can record the information more simply and directly. This commit adds `paths_matching_assoc_types` fields to `Resolver` and `ResolverGlobalCtxt`. These store the spans of the paths of interest. The new subdiagnostic `AssocTypeWithSameName` is used to construct the relevant suggestions when they are needed. Much nicer. The old approach removed the stashed diagnostic and the new approach doesn't remove the set entry, so a single span could conceivably match more than once, presumably a good thing, though this doesn't show up in the test suite.

@GuillaumeGomez

…r=lolbinarycat,GuillaumeGomez fix quadratic naming of duplicate sidebar links This PR fixes quadratic naming of duplicate sidebar links as discussed in rust-lang#158174. Fixes rust-lang#158174 `get_next_url` gives duplicate sidebar links with unique names but it started counting from 1 every time which makes the page quadratic. So to make it more optimal I changed that to remember the next unique number for each name making it linear per page. Also added the test at `tests/rustdoc-html/deref/sidebar-links-deref-chain.rs` ### Results | N | Instructions (before) | Instructions (after) | Time (before) | Time (after) | |-----:|----------------------:|---------------------:|--------------:|-------------:| | 200 | 5.71 B | 3.69 B | 1.20 s | 1.01 s | | 400 | 22.40 B | 9.52 B | 3.79 s | 1.98 s | | 800 | 126.83 B | 30.82 B | 19.68 s | 6.04 s | | 1600 | — | — | 118.59 s | 37.76 s | r? @GuillaumeGomez

…llaumeGomez Enable EII tests for cg_gcc

@davidtwco

…TypeSuggestion, r=davidtwco Remove `StashKey::AssociatedTypeSuggestion` Currently it's used in a really hacky way: a diagnostic with an empty message and some suggestions is stashed. Later on it might be retrieved and its suggestions extracted. It uses `Level::Allow` so that it isn't printed by `emit_stashed_diagnostics` at shutdown if it hasn't been retrieved. This isn't a normal stashed diagnostic, more just a case of "save some information that might be useful for diagnostics later". We can record the information more simply and directly. This commit adds `paths_matching_assoc_types` fields to `Resolver` and `ResolverGlobalCtxt`. These store the spans of the paths of interest. The new subdiagnostic `AssocTypeWithSameName` is used to construct the relevant suggestions when they are needed. Much nicer. The old approach removed the stashed diagnostic and the new approach doesn't remove the set entry, so a single span could conceivably match more than once, presumably a good thing, though this doesn't show up in the test suite. r? @davidtwco

jhpratt · 2026-09-23T23:57:21Z

@bors r+ p=5

rust-bors · 2026-09-23T23:57:25Z

📌 Commit aa2955d has been approved by jhpratt

It is now in the queue for this repository.

Rollup of 8 pull requests Successful merges: - #162976 (fix quadratic naming of duplicate sidebar links) - #163222 (Enable EII tests for cg_gcc) - #162942 (Remove `StashKey::AssociatedTypeSuggestion`) - #163096 (Don't suggest `std::` rustfix paths in `#![no_std]` crates) - #163110 (Mark `std::os::wasip2` with correct doc-cfgs, mark as unstable) - #163185 (properly decrement available_depth on cycles and provisional cache hits) - #163214 (revert r14 register names for arm) - #163226 (miri subtree update)

rust-bors · 2026-09-24T04:09:06Z

💔 Test for d6642e8 failed: CI. Failed job:

auto - test-i686-gnu-1 (web logs, enhanced plaintext logs)

jhpratt · 2026-09-24T04:41:25Z

@bors retry

@bors try jobs=test-i686-gnu-1

Rollup of 8 pull requests try-job: test-i686-gnu-1

Rollup of 8 pull requests Successful merges: - #162976 (fix quadratic naming of duplicate sidebar links) - #163222 (Enable EII tests for cg_gcc) - #162942 (Remove `StashKey::AssociatedTypeSuggestion`) - #163096 (Don't suggest `std::` rustfix paths in `#![no_std]` crates) - #163110 (Mark `std::os::wasip2` with correct doc-cfgs, mark as unstable) - #163185 (properly decrement available_depth on cycles and provisional cache hits) - #163214 (revert r14 register names for arm) - #163226 (miri subtree update)

rust-bors · 2026-09-24T06:51:42Z

☀️ Try build successful (CI)
Build commit: bed074c (bed074ca9652e88fa7a9742c65a3a8c5edf62a3b)
Base parent: 3670d25 (3670d2532bdf51abbe0b8fea22284d7ca340ffe3)

rust-log-analyzer · 2026-09-24T07:34:06Z

The job test-aarch64-apple-1 failed! Check out the build log: (web) (plain enhanced) (plain)

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

To only update this specific test, also pass `--test-args eii/static/default_apple.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/bin/rustc" "/Users/runner/work/rust/rust/tests/ui/eii/static/default_apple.rs" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/.cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/work/rust/rust/vendor" "--sysroot" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2" "--target=aarch64-apple-darwin" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/eii/static/default_apple" "-Znext-solver=coherence" "-A" "unused" "-W" "unused_attributes" "-A" "internal_features" "-A" "incomplete_features" "-A" "unused_parens" "-A" "unused_braces" "-Crpath" "-Cdebuginfo=0" "-Lnative=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/native/rust-test-helpers"
stdout: none
--- stderr -------------------------------
error: `#[eii]` cannot be used on statics with a value on Apple targets
##[error]  --> /Users/runner/work/rust/rust/tests/ui/eii/static/default_apple.rs:6:25
   |

rust-bors · 2026-09-24T07:34:34Z

💔 Test for 77cd507 failed: CI. Failed job:

auto - test-aarch64-apple-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-09-24T07:37:58Z

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

RalfJung and others added 30 commits August 29, 2026 09:54

move .auto settings into miri.toml file

7029337

add ./miri toolchain --name to configure which toolchain to install…

4924c57

…+activate

miri.toml: allow configuring the default toolchain name

937d7a2

miri.toml: allow configuring toolchain components

c28b273

fix quadratic naming of duplicate sidebar links

9630065

Add std_or_core helper for crate-qualified rustfix paths

8955f77

Use std_or_core in undropped_manually_drops rustfix

4238ee3

simplify get_next_url to a single counter map

1875276

RA settings: disable diagnostics as RA shows many false positives

447bb32

Mark std::os::wasip2 with correct doc-cfgs, mark as unstable

e4ad05b

Merge pull request rust-lang#5338 from RalfJung/vscode-settings

1f28dfc

VSCode settings: disable diagnostics as RA shows many false positives

Prepare for merging from rust-lang/rust

5a61e9c

This updates the rust-version file to 88638df.

Merge pull request rust-lang#5340 from rust-lang/rustup-2026-09-22

fd49fb3

Automatic Rustup

Merge pull request rust-lang#5289 from RalfJung/miri.toml

c85e050

Add `miri.toml` config file for `./miri` script

add test for #[path] in doctest

3e06823

forward rustdoc env vars to doctests

e53b292

Merge pull request rust-lang#5342 from RalfJung/doctest-path

b2e7048

fix #[path] in doctest

Use std_or_core in integer_to_ptr_transmutes rustfix

4858117

Use std_or_core in ambiguous_wide_pointer_comparisons rustfix

711d861

Use std_or_core in unpredictable_function_pointer_comparisons rus…

ed84ade

…tfix

Skip panic_any rustfix in non_fmt_panics when it is unavailable

e31fb47

revert r14 register names for arm

b7dc072

Export std_or_core

2b022a3

Enable EII tests for cg_gcc

494b3f8

properly decrement available_depth on cycles and provisional cache hits

e9824e4

Rollup merge of rust-lang#163222 - AsakuraMizu:eii-gcc, r=BoxyUwU,Gui…

f10b845

…llaumeGomez Enable EII tests for cg_gcc

rustbot added 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 Sep 23, 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 Sep 23, 2026

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 Sep 24, 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 Sep 24, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Sep 24, 2026

Auto merge of #163236 - jhpratt:rollup-w93uMhT, r=<try>

bed074c

Rollup of 8 pull requests try-job: test-i686-gnu-1

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 Sep 24, 2026

JonathanBrouwer mentioned this pull request Sep 24, 2026

Enable EII tests for cg_gcc #163222

Merged

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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 24, 2026

JonathanBrouwer closed this Sep 24, 2026

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 24, 2026

jhpratt deleted the rollup-w93uMhT branch September 25, 2026 06:26

Navigation Menu

Uh oh!

Rollup of 8 pull requests - #163236

Rollup of 8 pull requests#163236
jhpratt wants to merge 35 commits into
rust-lang:mainfrom
jhpratt:rollup-w93uMhT

jhpratt commented Sep 23, 2026

Uh oh!

jhpratt commented Sep 23, 2026

Uh oh!

rust-bors Bot commented Sep 23, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Sep 24, 2026

Uh oh!

jhpratt commented Sep 24, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented Sep 24, 2026

Uh oh!

rust-log-analyzer commented Sep 24, 2026

Uh oh!

rust-bors Bot commented Sep 24, 2026

Uh oh!

rust-bors Bot commented Sep 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Uh oh!

Conversation

jhpratt commented Sep 23, 2026

Uh oh!

jhpratt commented Sep 23, 2026

Uh oh!

rust-bors Bot commented Sep 23, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Sep 24, 2026

Uh oh!

jhpratt commented Sep 24, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented Sep 24, 2026

Uh oh!

rust-log-analyzer commented Sep 24, 2026

Uh oh!

rust-bors Bot commented Sep 24, 2026

Uh oh!

rust-bors Bot commented Sep 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants