Skip to content

Commit

Permalink
Rollup merge of #125142 - GuillaumeGomez:migrate-rustdoc-themes, r=ji…
Browse files Browse the repository at this point in the history
…eyouxu

Migrate `run-make/rustdoc-themes` to new rmake.rs

Part of #121876.

r? `@jieyouxu`
  • Loading branch information
fmease authored May 15, 2024
2 parents c5b17ec + c765480 commit 80f991e
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 20 deletions.
6 changes: 6 additions & 0 deletions src/tools/run-make-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ pub fn python_command() -> Command {
Command::new(python_path)
}

pub fn htmldocck() -> Command {
let mut python = python_command();
python.arg(source_path().join("/src/etc/htmldocck.py"));
python
}

pub fn source_path() -> PathBuf {
std::env::var("S").expect("S variable does not exist").into()
}
Expand Down
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ run-make/rustdoc-scrape-examples-multiple/Makefile
run-make/rustdoc-scrape-examples-remap/Makefile
run-make/rustdoc-scrape-examples-test/Makefile
run-make/rustdoc-scrape-examples-whitespace/Makefile
run-make/rustdoc-themes/Makefile
run-make/rustdoc-verify-output-files/Makefile
run-make/rustdoc-with-out-dir-option/Makefile
run-make/rustdoc-with-output-option/Makefile
Expand Down
10 changes: 2 additions & 8 deletions tests/run-make/rustdoc-scrape-examples-ordering/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use run_make_support::{python_command, rustc, rustdoc, source_path, tmp_dir};
use run_make_support::{htmldocck, rustc, rustdoc, source_path, tmp_dir};
use std::fs::read_dir;
use std::path::Path;

Expand Down Expand Up @@ -45,11 +45,5 @@ fn main() {
}
rustdoc.run();

python_command()
.arg(source_path().join("/src/etc/htmldocck.py"))
.arg(out_dir)
.arg("src/lib.rs")
.status()
.unwrap()
.success();
htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success();
}
11 changes: 0 additions & 11 deletions tests/run-make/rustdoc-themes/Makefile

This file was deleted.

31 changes: 31 additions & 0 deletions tests/run-make/rustdoc-themes/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Test that rustdoc will properly load in a theme file and display it in the theme selector.

use run_make_support::{htmldocck, rustdoc, source_path, tmp_dir};

fn main() {
let out_dir = tmp_dir().join("rustdoc-themes");
let test_css = out_dir.join("test.css");

let no_script =
std::fs::read_to_string(source_path().join("src/librustdoc/html/static/css/noscript.css"))
.unwrap();

let mut test_content = String::new();
let mut found_begin_light = false;
for line in no_script.split('\n') {
if line == "/* Begin theme: light */" {
found_begin_light = true;
} else if line == "/* End theme: light */" {
break;
} else if found_begin_light {
test_content.push_str(line);
test_content.push('\n');
}
}
assert!(!test_content.is_empty());
std::fs::create_dir_all(&out_dir).unwrap();
std::fs::write(&test_css, test_content).unwrap();

rustdoc().output(&out_dir).input("foo.rs").arg("--theme").arg(&test_css).run();
htmldocck().arg(out_dir).arg("foo.rs").status().unwrap().success();
}

0 comments on commit 80f991e

Please sign in to comment.