Skip to content

rustdoc: Switch from FxHash to sha256 for static file hashing. - #131908

Merged
bors merged 1 commit into
rust-lang:masterfrom
aDotInTheVoid:rustdoc-gamer-hashing
Oct 19, 2024
Merged

rustdoc: Switch from FxHash to sha256 for static file hashing.#131908
bors merged 1 commit into
rust-lang:masterfrom
aDotInTheVoid:rustdoc-gamer-hashing

Conversation

@aDotInTheVoid

@aDotInTheVoidaDotInTheVoid commented Oct 18, 2024•
edited
Loading

Copy link
Copy Markdown
Member

Fixes#129533 (comment)

fxhash isn't well defined, and it's implementation is being changed in #129533. But because rustdoc uses it for static files (and encodes that hashing in rustdoc.css), this broke our tests. Given that this isn't performace critical, I think the right fix is to used a well-defined hash that will never change its definition. I've picked (rather arbitrarily) sha256.

@rustbot

rustbot commented Oct 18, 2024

Copy link
Copy Markdown
Collaborator

r? @GuillaumeGomez

rustbot has assigned @GuillaumeGomez.
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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Oct 18, 2024
@rustbot

rustbot commented Oct 18, 2024

Copy link
Copy Markdown
Collaborator

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @jsha

Noratrieb
Noratrieb reviewed Oct 18, 2024
View reviewed changes
Comment threadsrc/librustdoc/html/static/css/rustdoc.css Outdated
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the rustdoc-gamer-hashing branch from 9393a0e to 3c74054CompareOctober 18, 2024 21:56
notriddle
notriddle reviewed Oct 19, 2024
View reviewed changes
Comment threadsrc/librustdoc/html/static_files.rs Outdated
@aDotInTheVoidaDotInTheVoid mentioned this pull request Oct 19, 2024
Closed
@rust-cloud-vms
rust-cloud-vmsBotforce-pushed the rustdoc-gamer-hashing branch from 3c74054 to 3cf8a61CompareOctober 19, 2024 01:06
@GuillaumeGomez

GuillaumeGomez commented Oct 19, 2024

Copy link
Copy Markdown
Member

Just realised the same thing a few seconds ago. Thanks a lot!

r=me once CI pass

@notriddle

notriddle commented Oct 19, 2024

Copy link
Copy Markdown
Contributor

@bors r=notriddle,GuillaumeGomez

@bors

bors commented Oct 19, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 3cf8a61 has been approved by notriddle,GuillaumeGomez

It is now in the queue for this repository.

@borsbors 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 Oct 19, 2024
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Oct 19, 2024
@workingjubilee
Rollup merge ofrust-lang#131908- aDotInTheVoid:rustdoc-gamer-hashin…
8d3e989
…g, r=notriddle,GuillaumeGomez
rustdoc: Switch from FxHash to sha256 for static file hashing.
Fixesrust-lang#129533 (comment)
fxhash isn't well defined, and it's implementation is being changed in rust-lang#129533. But because rustdoc uses it for static files (and encodes that hashing in rustdoc.css), this broke our tests. Given that this isn't performace critical, I think the right fix is to used a well-defined hash that will never change its definition. I've picked (rather arbitrarily) sha256.
@workingjubileeworkingjubilee mentioned this pull request Oct 19, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 19, 2024
@bors
Auto merge ofrust-lang#131914- workingjubilee:rollup-o0p7v51, r=wor…
dbf7748
…kingjubilee
Rollup of 8 pull requests
Successful merges:
- rust-lang#127462 (std: uefi: Add basic Env variables)
- rust-lang#131537 (Fix range misleading field access)
- rust-lang#131838 (bootstrap: allow setting `--jobs` in config.toml)
- rust-lang#131871 (x86-32 float return for 'Rust' ABI: treat all float types consistently)
- rust-lang#131876 (compiler: Use LLVM's Comdat support)
- rust-lang#131890 (Update `use` keyword docs to describe precise capturing)
- rust-lang#131899 (Mark unexpected variant res suggestion as having placeholders)
- rust-lang#131908 (rustdoc: Switch from FxHash to sha256 for static file hashing.)
r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 19, 2024
@matthiaskrgr
Rollup merge ofrust-lang#131908- aDotInTheVoid:rustdoc-gamer-hashin…
0ca10bb
…g, r=notriddle,GuillaumeGomez
rustdoc: Switch from FxHash to sha256 for static file hashing.
Fixesrust-lang#129533 (comment)
fxhash isn't well defined, and it's implementation is being changed in rust-lang#129533. But because rustdoc uses it for static files (and encodes that hashing in rustdoc.css), this broke our tests. Given that this isn't performace critical, I think the right fix is to used a well-defined hash that will never change its definition. I've picked (rather arbitrarily) sha256.
@matthiaskrgrmatthiaskrgr mentioned this pull request Oct 19, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 19, 2024
@bors
Auto merge ofrust-lang#131922- matthiaskrgr:rollup-hhl3wvk, r=matth…
147345d
…iaskrgr
Rollup of 10 pull requests
Successful merges:
- rust-lang#127462 (std: uefi: Add basic Env variables)
- rust-lang#131537 (Fix range misleading field access)
- rust-lang#131838 (bootstrap: allow setting `--jobs` in config.toml)
- rust-lang#131871 (x86-32 float return for 'Rust' ABI: treat all float types consistently)
- rust-lang#131876 (compiler: Use LLVM's Comdat support)
- rust-lang#131890 (Update `use` keyword docs to describe precise capturing)
- rust-lang#131899 (Mark unexpected variant res suggestion as having placeholders)
- rust-lang#131908 (rustdoc: Switch from FxHash to sha256 for static file hashing.)
- rust-lang#131916 (small interpreter error cleanup)
- rust-lang#131919 (zero-sized accesses are fine on null pointers)
r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 19, 2024
@matthiaskrgr
Rollup merge ofrust-lang#131908- aDotInTheVoid:rustdoc-gamer-hashin…
9f162e1
…g, r=notriddle,GuillaumeGomez
rustdoc: Switch from FxHash to sha256 for static file hashing.
Fixesrust-lang#129533 (comment)
fxhash isn't well defined, and it's implementation is being changed in rust-lang#129533. But because rustdoc uses it for static files (and encodes that hashing in rustdoc.css), this broke our tests. Given that this isn't performace critical, I think the right fix is to used a well-defined hash that will never change its definition. I've picked (rather arbitrarily) sha256.
@matthiaskrgrmatthiaskrgr mentioned this pull request Oct 19, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 19, 2024
@bors
Auto merge ofrust-lang#131924- matthiaskrgr:rollup-15u5tif, r=matth…
32ee285
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#127462 (std: uefi: Add basic Env variables)
- rust-lang#131537 (Fix range misleading field access)
- rust-lang#131838 (bootstrap: allow setting `--jobs` in config.toml)
- rust-lang#131871 (x86-32 float return for 'Rust' ABI: treat all float types consistently)
- rust-lang#131890 (Update `use` keyword docs to describe precise capturing)
- rust-lang#131899 (Mark unexpected variant res suggestion as having placeholders)
- rust-lang#131908 (rustdoc: Switch from FxHash to sha256 for static file hashing.)
- rust-lang#131916 (small interpreter error cleanup)
- rust-lang#131919 (zero-sized accesses are fine on null pointers)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgrmatthiaskrgr mentioned this pull request Oct 19, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 19, 2024
@bors
Auto merge ofrust-lang#131934- matthiaskrgr:rollup-pd3dwxu, r=matth…
8069f8d
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#127462 (std: uefi: Add basic Env variables)
- rust-lang#131537 (Fix range misleading field access)
- rust-lang#131838 (bootstrap: allow setting `--jobs` in config.toml)
- rust-lang#131890 (Update `use` keyword docs to describe precise capturing)
- rust-lang#131899 (Mark unexpected variant res suggestion as having placeholders)
- rust-lang#131908 (rustdoc: Switch from FxHash to sha256 for static file hashing.)
- rust-lang#131916 (small interpreter error cleanup)
- rust-lang#131919 (zero-sized accesses are fine on null pointers)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 1dcb77b into rust-lang:masterOct 19, 2024
@rustbotrustbot added this to the 1.84.0 milestone Oct 19, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 19, 2024
@rust-timer
Unrolled build forrust-lang#131908
5a3fb77
Rollup merge of rust-lang#131908 - aDotInTheVoid:rustdoc-gamer-hashing, r=notriddle,GuillaumeGomez
rustdoc: Switch from FxHash to sha256 for static file hashing.
Fixesrust-lang#129533 (comment)
fxhash isn't well defined, and it's implementation is being changed in rust-lang#129533. But because rustdoc uses it for static files (and encodes that hashing in rustdoc.css), this broke our tests. Given that this isn't performace critical, I think the right fix is to used a well-defined hash that will never change its definition. I've picked (rather arbitrarily) sha256.
@aDotInTheVoid
aDotInTheVoid deleted the rustdoc-gamer-hashing branch October 19, 2024 20:01
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@NoratriebNoratriebNoratrieb left review comments
@notriddlenotriddlenotriddle approved these changes
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.84.0

Development

Successfully merging this pull request may close these issues.

7 participants

@aDotInTheVoid@rustbot@rust-log-analyzer@GuillaumeGomez@notriddle@bors@Noratrieb