Skip to content

Conversation

GuillaumeGomez
Copy link
Member

Fixes #110002.

The file was generated in the wrong folder so I moved it into static.files as it made more sense to have there instead of changing the path in the templates.

I also added a GUI test to ensure that this option won't break unexpectedly again.

@rustbot
Copy link
Collaborator

rustbot commented Apr 12, 2023

r? @notriddle

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Apr 12, 2023
@notriddle
Copy link
Contributor

Will this work in docs.rs? It seems to have a dedicated route for static files that will only resolve toolchain files, not invocation-specific ones:

https://github.com/rust-lang/docs.rs/blob/fe3286d994aa5904292f377335f82cedb17b4857/src/web/routes.rs#L223

And crate authors can instruct docs.rs to pass rustdoc-args using metadata:

https://docs.rs/about/metadata

@GuillaumeGomez
Copy link
Member Author

That's a very good point. I think updating the path in the template is the correct way to do this then.

@GuillaumeGomez
Copy link
Member Author

Applied suggestions.

@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 12, 2023

📌 Commit b76821b has been approved by notriddle

It is now in the queue for this repository.

@bors bors 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 Apr 12, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#109810 (Replace rustdoc-ui/{c,z}-help tests with a stable run-make test )
 - rust-lang#110035 (fix: ensure bad `#[test]` invocs retain correct AST)
 - rust-lang#110089 (sync::mpsc: synchronize receiver disconnect with initialization)
 - rust-lang#110103 (Report overflows gracefully with new solver)
 - rust-lang#110122 (Fix x check --stage 1 when download-ci-llvm=false)
 - rust-lang#110133 (Do not use ImplDerivedObligationCause for inherent impl method error reporting)
 - rust-lang#110135 (Revert "Don't recover lifetimes/labels containing emojis as character literals")
 - rust-lang#110235 (Fix `--extend-css` option)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b01f0d3 into rust-lang:master Apr 13, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 13, 2023
@GuillaumeGomez GuillaumeGomez deleted the fix-extend-css branch April 13, 2023 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustdoc: --extend-css option refers to ../static.files/theme.css but puts css in ../theme.css
4 participants