Skip to content

Commit 59b4f88

Browse files
authored
Rollup merge of #86933 - GuillaumeGomez:cleanup-rustdoc-static-files, r=Manishearth
Clean up rustdoc static files The `html/static` of rustdoc was starting to be quite a mess... So I moved files in sub-folders to make it easier to follow. Here what remains in `html/static` folder: ``` $ ls COPYRIGHT.txt css fonts images js LICENSE-APACHE.txt LICENSE-MIT.txt ``` cc ```@jyn514``` r? ```@Manishearth```
2 parents 463301a + e5c24ba commit 59b4f88

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+48
-47
lines changed

src/bootstrap/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ impl Step for RustdocTheme {
742742
let rustdoc = builder.out.join("bootstrap/debug/rustdoc");
743743
let mut cmd = builder.tool_cmd(Tool::RustdocTheme);
744744
cmd.arg(rustdoc.to_str().unwrap())
745-
.arg(builder.src.join("src/librustdoc/html/static/themes").to_str().unwrap())
745+
.arg(builder.src.join("src/librustdoc/html/static/css/themes").to_str().unwrap())
746746
.env("RUSTC_STAGE", self.compiler.stage.to_string())
747747
.env("RUSTC_SYSROOT", builder.sysroot(self.compiler))
748748
.env("RUSTDOC_LIBDIR", builder.sysroot_libdir(self.compiler, self.compiler.host))

src/ci/docker/host-x86_64/mingw-check/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ ENV SCRIPT python3 ../x.py --stage 2 test src/tools/expand-yaml-anchors && \
4040
/scripts/validate-toolstate.sh && \
4141
/scripts/validate-error-codes.sh && \
4242
# Runs checks to ensure that there are no ES5 issues in our JS code.
43-
es-check es5 ../src/librustdoc/html/static/*.js && \
44-
eslint ../src/librustdoc/html/static/*.js
43+
es-check es5 ../src/librustdoc/html/static/js/*.js && \
44+
eslint ../src/librustdoc/html/static/js/*.js

src/librustdoc/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ impl Options {
513513
))
514514
.warn("the theme may appear incorrect when loaded")
515515
.help(&format!(
516-
"to see what rules are missing, call `rustdoc --check-theme \"{}\"`",
516+
"to see what rules are missing, call `rustdoc --check-theme \"{}\"`",
517517
theme_s
518518
))
519519
.emit();

0 commit comments

Comments
 (0)