Skip to content

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented May 28, 2025

What does this PR try to resolve?

Fixes #15604

rustdoc assumes to add static files only when the
toolchain-shared-resources emit-type is specified, or when no emit-type is specified.

See https://github.com/rust-lang/rust/blob/80c34983c63968c204096e79b9126c0039790741/src/librustdoc/html/render/write_shared.rs#L206-L213

How should we test and review this PR?

Not going to write a test because I don't think we want to inspect into how rustdoc arranges static files.

See #15604 for how to reproduce/test.

Additional information

cc #15370

…oc styled

rustdoc assumes to add static files only when the
toolchain-shared-resources emit-type is specified,
or when no emit-type is specified.

See
https://github.com/rust-lang/rust/blob/80c34983c63968c204096e79b9126c0039790741/src/librustdoc/html/render/write_shared.rs#L206-L213
@rustbot
Copy link
Collaborator

rustbot commented May 28, 2025

r? @epage

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

@rustbot rustbot added A-build-execution Area: anything dealing with executing the compiler S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 28, 2025
@weihanglo weihanglo added the Z-rustdoc-depinfo Nightly: rustdoc-depinfo integration label May 28, 2025
@epage epage enabled auto-merge May 28, 2025 20:49
@epage epage added this pull request to the merge queue May 28, 2025
Merged via the queue into rust-lang:master with commit 36daa73 May 28, 2025
23 checks passed
bors added a commit to rust-lang/rust that referenced this pull request May 31, 2025
Update cargo

12 commits in 68db37499f2de8acef704c73d9031be6fbcbaee4..64a12460708cf146e16cc61f28aba5dc2463bbb4
2025-05-22 14:27:15 +0000 to 2025-05-30 18:25:08 +0000
- chore: remove HTML comments and inline guide (rust-lang/cargo#15613)
- Add .git-blame-ignore-revs (rust-lang/cargo#15612)
- refactor: cleanup for `CompileMode` (rust-lang/cargo#15608)
- refactor: separate "global" mode from CompileMode (rust-lang/cargo#15601)
- fix(doc): pass `toolchain-shared-resources` to get doc styled (rust-lang/cargo#15605)
- fix(embedded): Resolve multiple bugs in frontmatter parser (rust-lang/cargo#15573)
- chore: Upgrade schemars (rust-lang/cargo#15602)
- Update gix & socket2 (rust-lang/cargo#15600)
- Add `-Zfix-edition` (rust-lang/cargo#15596)
- chore(toml): disable `toml`'s default features, unless necessary (rust-lang/cargo#15598)
- docs(README): fix the link to the changelog in the Cargo book (rust-lang/cargo#15597)
- Add the future edition (rust-lang/cargo#15595)

r? ghost
@rustbot rustbot added this to the 1.89.0 milestone May 31, 2025
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request May 31, 2025
Update cargo

12 commits in 68db37499f2de8acef704c73d9031be6fbcbaee4..64a12460708cf146e16cc61f28aba5dc2463bbb4
2025-05-22 14:27:15 +0000 to 2025-05-30 18:25:08 +0000
- chore: remove HTML comments and inline guide (rust-lang/cargo#15613)
- Add .git-blame-ignore-revs (rust-lang/cargo#15612)
- refactor: cleanup for `CompileMode` (rust-lang/cargo#15608)
- refactor: separate "global" mode from CompileMode (rust-lang/cargo#15601)
- fix(doc): pass `toolchain-shared-resources` to get doc styled (rust-lang/cargo#15605)
- fix(embedded): Resolve multiple bugs in frontmatter parser (rust-lang/cargo#15573)
- chore: Upgrade schemars (rust-lang/cargo#15602)
- Update gix & socket2 (rust-lang/cargo#15600)
- Add `-Zfix-edition` (rust-lang/cargo#15596)
- chore(toml): disable `toml`'s default features, unless necessary (rust-lang/cargo#15598)
- docs(README): fix the link to the changelog in the Cargo book (rust-lang/cargo#15597)
- Add the future edition (rust-lang/cargo#15595)

r? ghost
@weihanglo weihanglo deleted the rustdoc-depinfo branch June 2, 2025 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-build-execution Area: anything dealing with executing the compiler S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. Z-rustdoc-depinfo Nightly: rustdoc-depinfo integration

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Fresh doc build with -Zrustdoc-depinfo has no files in static.files directory

3 participants