Make `DocLinkResMap` an `FxIndexMap` by jprochazk · Pull Request #159718 · rust-lang/rust

jprochazk · 2026-07-22T13:26:48Z

Previously it was FxHashMap, changed to UnordMap in #119093. The rationale then was to make the iteration order unobservable, but it turned out to be leaky.

This change means the encoder outputs doc_link_resolutions entries in insertion order, and iteration order of the DocLinkResMap is now observable. I believe this doesn't affect correctness elsewhere, but I'm not very familiar with the codebase so I may be missing something

Closes .rmeta contents depend on unrelated files in the library search path #159677

Discussed on zulip: #t-compiler/help > #159677: rmeta encoding is not stable

rustbot · 2026-07-22T13:26:53Z

r? @petrochenkov

rustbot has assigned @petrochenkov.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: compiler
compiler expanded to 74 candidates
Random selection from 20 candidates

petrochenkov · 2026-07-22T15:18:35Z

r=me after squashing commits.
@rustbot author

rustbot · 2026-07-22T15:18:39Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

jprochazk · 2026-07-22T15:41:01Z

Squashed into one commit

@rustbot ready

mejrs · 2026-07-22T17:02:49Z

Thanks!

@bors r=petrochenkov

rust-bors · 2026-07-22T17:02:52Z

📌 Commit 70b89c3 has been approved by petrochenkov

It is now in the queue for this repository.

…r=petrochenkov Make `DocLinkResMap` an `FxIndexMap` Previously it was `FxHashMap`, changed to `UnordMap` in rust-lang#119093. The rationale then was to make the iteration order unobservable, but it turned out to be leaky. This change means the encoder outputs `doc_link_resolutions` entries in insertion order, and iteration order of the `DocLinkResMap` is now observable. I believe this doesn't affect correctness elsewhere, but I'm not very familiar with the codebase so I may be missing something * Closes rust-lang#159677 Discussed on zulip: [#t-compiler/help > rust-lang#159677: rmeta encoding is not stable](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/.23159677.3A.20rmeta.20encoding.20is.20not.20stable/with/612134270)

GuillaumeGomez · 2026-07-22T22:28:38Z

Failed in try build in #159742.

@bors r-

rustbot · 2026-07-22T23:44:50Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

jprochazk · 2026-07-22T23:51:35Z

Added //@ needs-target-std, and rebased the branch. This might warrant a try run, but I'm not sure I can trigger that myself?

@rustbot ready

GuillaumeGomez · 2026-07-23T09:25:29Z

It's fine, thanks for the update!

@bors r=petrochenkov

rust-bors · 2026-07-23T09:28:20Z

📌 Commit f9d9939 has been approved by petrochenkov

It is now in the queue for this repository.

…r=petrochenkov Make `DocLinkResMap` an `FxIndexMap` Previously it was `FxHashMap`, changed to `UnordMap` in rust-lang#119093. The rationale then was to make the iteration order unobservable, but it turned out to be leaky. This change means the encoder outputs `doc_link_resolutions` entries in insertion order, and iteration order of the `DocLinkResMap` is now observable. I believe this doesn't affect correctness elsewhere, but I'm not very familiar with the codebase so I may be missing something * Closes rust-lang#159677 Discussed on zulip: [#t-compiler/help > rust-lang#159677: rmeta encoding is not stable](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/.23159677.3A.20rmeta.20encoding.20is.20not.20stable/with/612134270)

Rollup of 18 pull requests Successful merges: - #138618 (Support using const pointers in asm `const` operand) - #150161 (Remove 'static requirement on try_as_dyn) - #158362 (trait solver: account for universes from replace_bound_vars) - #159173 (Add allowed list check on EII implementations attributes) - #159466 (cmse: clear variant-dependent padding in `enum`s) - #159718 (Make `DocLinkResMap` an `FxIndexMap`) - #155795 (constify `vec![1, 2, 3]` macro) - #157776 (ci: Enable autodiff tests on x86_64 linux) - #157905 (Update comments and add tests for `-Zrandomize-layout` for some guaranteed ZSTs) - #159041 (Reorganize `tests/ui/issues` [22/N]) - #159108 (Reorganize `tests/ui/issues` [23/N]) - #159138 (doc: document wasm import symbol mangling) - #159531 (Reorganize `tests/ui/issues` [28/N]) - #159608 (early_otherwise: Don't hoist dereferences when the otherwise branch is reachable) - #159612 (Reorganize `tests/ui/issues` [29/N]) - #159653 (run `tests/assembly-llvm/asm/aarch64-types.rs` for `aarch64_be`) - #159759 (rustc-dev-guide subtree update) - #159761 (Remove outdated comment for resolve_vars_with_obligations)

…r=petrochenkov Make `DocLinkResMap` an `FxIndexMap` Previously it was `FxHashMap`, changed to `UnordMap` in rust-lang#119093. The rationale then was to make the iteration order unobservable, but it turned out to be leaky. This change means the encoder outputs `doc_link_resolutions` entries in insertion order, and iteration order of the `DocLinkResMap` is now observable. I believe this doesn't affect correctness elsewhere, but I'm not very familiar with the codebase so I may be missing something * Closes rust-lang#159677 Discussed on zulip: [#t-compiler/help > rust-lang#159677: rmeta encoding is not stable](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/.23159677.3A.20rmeta.20encoding.20is.20not.20stable/with/612134270)

Rollup of 19 pull requests Successful merges: - #150161 (Remove 'static requirement on try_as_dyn) - #158362 (trait solver: account for universes from replace_bound_vars) - #159173 (Add allowed list check on EII implementations attributes) - #159466 (cmse: clear variant-dependent padding in `enum`s) - #159718 (Make `DocLinkResMap` an `FxIndexMap`) - #155795 (constify `vec![1, 2, 3]` macro) - #157776 (ci: Enable autodiff tests on x86_64 linux) - #157905 (Update comments and add tests for `-Zrandomize-layout` for some guaranteed ZSTs) - #158766 (Promote riscv64-unknown-linux-musl to tier 2 with host tools) - #159041 (Reorganize `tests/ui/issues` [22/N]) - #159108 (Reorganize `tests/ui/issues` [23/N]) - #159138 (doc: document wasm import symbol mangling) - #159531 (Reorganize `tests/ui/issues` [28/N]) - #159608 (early_otherwise: Don't hoist dereferences when the otherwise branch is reachable) - #159612 (Reorganize `tests/ui/issues` [29/N]) - #159653 (run `tests/assembly-llvm/asm/aarch64-types.rs` for `aarch64_be`) - #159667 (Make some parser structured suggestions verbose and tweak their wording) - #159759 (rustc-dev-guide subtree update) - #159761 (Remove outdated comment for resolve_vars_with_obligations)

…r=petrochenkov Make `DocLinkResMap` an `FxIndexMap` Previously it was `FxHashMap`, changed to `UnordMap` in rust-lang#119093. The rationale then was to make the iteration order unobservable, but it turned out to be leaky. This change means the encoder outputs `doc_link_resolutions` entries in insertion order, and iteration order of the `DocLinkResMap` is now observable. I believe this doesn't affect correctness elsewhere, but I'm not very familiar with the codebase so I may be missing something * Closes rust-lang#159677 Discussed on zulip: [#t-compiler/help > rust-lang#159677: rmeta encoding is not stable](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/.23159677.3A.20rmeta.20encoding.20is.20not.20stable/with/612134270)

Rollup of 12 pull requests Successful merges: - #159765 (Avoid spurious rebuilds of JSON docs in bootstrap) - #159781 (Update bootstrap to use -Zembed-metadata=no instead of -Zno-embed-metadata) - #158362 (trait solver: account for universes from replace_bound_vars) - #159173 (Add allowed list check on EII implementations attributes) - #159718 (Make `DocLinkResMap` an `FxIndexMap`) - #159722 ( [rustdoc] Retrieve `cfg_attr` information for derived impls for `doc_cfg` feature) - #155795 (constify `vec![1, 2, 3]` macro) - #157776 (ci: Enable autodiff tests on x86_64 linux) - #158766 (Promote riscv64-unknown-linux-musl to tier 2 with host tools) - #159271 (str: add ASCII fast path to word_to_titlecase) - #159666 (fix(ld64.lld): route version mismatch warnings to linker_info on macOS) - #159667 (Make some parser structured suggestions verbose and tweak their wording)

Rollup of 14 pull requests Successful merges: - #159765 (Avoid spurious rebuilds of JSON docs in bootstrap) - #159781 (Update bootstrap to use -Zembed-metadata=no instead of -Zno-embed-metadata) - #158362 (trait solver: account for universes from replace_bound_vars) - #158372 (rustfmt: Discover modules via `cfg_select!`) - #159173 (Add allowed list check on EII implementations attributes) - #159718 (Make `DocLinkResMap` an `FxIndexMap`) - #159722 ( [rustdoc] Retrieve `cfg_attr` information for derived impls for `doc_cfg` feature) - #159731 (std: Implement futex on wasip3 targets, update target spec) - #159755 (Improve consistency of attribute error messages) - #155795 (constify `vec![1, 2, 3]` macro) - #157776 (ci: Enable autodiff tests on x86_64 linux) - #158766 (Promote riscv64-unknown-linux-musl to tier 2 with host tools) - #159271 (str: add ASCII fast path to word_to_titlecase) - #159667 (Make some parser structured suggestions verbose and tweak their wording)

Rollup merge of #159718 - jprochazk:doc-link-res-index-map, r=petrochenkov Make `DocLinkResMap` an `FxIndexMap` Previously it was `FxHashMap`, changed to `UnordMap` in #119093. The rationale then was to make the iteration order unobservable, but it turned out to be leaky. This change means the encoder outputs `doc_link_resolutions` entries in insertion order, and iteration order of the `DocLinkResMap` is now observable. I believe this doesn't affect correctness elsewhere, but I'm not very familiar with the codebase so I may be missing something * Closes #159677 Discussed on zulip: [#t-compiler/help > #159677: rmeta encoding is not stable](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/.23159677.3A.20rmeta.20encoding.20is.20not.20stable/with/612134270)

rustbot assigned petrochenkov Jul 22, 2026

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 22, 2026

This comment has been minimized.

Sign in to view

jprochazk force-pushed the doc-link-res-index-map branch from 6338fe7 to 66a783d Compare July 22, 2026 13:28

This comment has been minimized.

Sign in to view

jprochazk force-pushed the doc-link-res-index-map branch from 66a783d to b8365e9 Compare July 22, 2026 13:29

This comment has been minimized.

Sign in to view

mejrs reviewed Jul 22, 2026

View reviewed changes

Comment thread compiler/rustc_hir/src/def.rs Outdated

rustbot 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 Jul 22, 2026

jprochazk force-pushed the doc-link-res-index-map branch from 6fe4fa7 to 70b89c3 Compare July 22, 2026 15:33

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 22, 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 Jul 22, 2026

JonathanBrouwer mentioned this pull request Jul 22, 2026

Rollup of 7 pull requests #159741

Closed

JonathanBrouwer mentioned this pull request Jul 22, 2026

Rollup of 7 pull requests #159742

Closed

GuillaumeGomez mentioned this pull request Jul 22, 2026

Rollup of 9 pull requests #159747

Closed

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 22, 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 Jul 23, 2026

jhpratt mentioned this pull request Jul 23, 2026

Rollup of 18 pull requests #159762

Closed

jhpratt mentioned this pull request Jul 23, 2026

Rollup of 19 pull requests #159766

Closed

jhpratt mentioned this pull request Jul 23, 2026

Rollup of 19 pull requests #159769

Closed

jhpratt mentioned this pull request Jul 23, 2026

Rollup of 23 pull requests #159793

Closed

jhpratt mentioned this pull request Jul 23, 2026

Rollup of 11 pull requests #159803

Closed

jhpratt mentioned this pull request Jul 24, 2026

Rollup of 12 pull requests #159806

Closed

jhpratt mentioned this pull request Jul 24, 2026

Rollup of 12 pull requests #159807

Closed

jhpratt mentioned this pull request Jul 24, 2026

Rollup of 14 pull requests #159814

Merged

rust-bors Bot merged commit d98e01e into rust-lang:main Jul 24, 2026
13 checks passed

rustbot added this to the 1.99.0 milestone Jul 24, 2026

Uh oh!

Uh oh!

Conversation

jprochazk commented Jul 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 22, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Uh oh!

petrochenkov commented Jul 22, 2026

Uh oh!

rustbot commented Jul 22, 2026

Uh oh!

jprochazk commented Jul 22, 2026

Uh oh!

mejrs commented Jul 22, 2026

Uh oh!

rust-bors Bot commented Jul 22, 2026

Uh oh!

GuillaumeGomez commented Jul 22, 2026

Uh oh!

rustbot commented Jul 22, 2026

Uh oh!

jprochazk commented Jul 22, 2026

Uh oh!

GuillaumeGomez commented Jul 23, 2026

Uh oh!

rust-bors Bot commented Jul 23, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jprochazk commented Jul 22, 2026 •

edited

Loading