nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-18 09:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #125178 - GuillaumeGomez:migrate-rustdoc-with-out-dir, r=jieyouxu

Browse Source 
Migrate `run-make/rustdoc-with-out-dir-option` to new `rmake.rs`

Part of https://github.com/rust-lang/rust/issues/121876.

r? `@jieyouxu`
This commit is contained in:
bors 2024-05-17 08:51:06 +00:00
commit a5c37eea5a
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/run-make-support/src/lib.rs
View File

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

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
View File

@ -243,7 +243,6 @@ run-make/rustdoc-scrape-examples-remap/Makefile
run-make/rustdoc-scrape-examples-test/Makefile run-make/rustdoc-scrape-examples-test/Makefile
run-make/rustdoc-scrape-examples-whitespace/Makefile run-make/rustdoc-scrape-examples-whitespace/Makefile
run-make/rustdoc-verify-output-files/Makefile run-make/rustdoc-verify-output-files/Makefile
run-make/rustdoc-with-out-dir-option/Makefile
run-make/rustdoc-with-output-option/Makefile run-make/rustdoc-with-output-option/Makefile
run-make/rustdoc-with-short-out-dir-option/Makefile run-make/rustdoc-with-short-out-dir-option/Makefile
run-make/sanitizer-cdylib-link/Makefile run-make/sanitizer-cdylib-link/Makefile

2
tests/run-make/rustdoc-scrape-examples-ordering/rmake.rs
View File

@ -45,5 +45,5 @@ fn main() {
} }
rustdoc.run(); rustdoc.run();
htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success(); assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
} }

2
tests/run-make/rustdoc-themes/rmake.rs
View File

@ -27,5 +27,5 @@ fn main() {
std::fs::write(&test_css, test_content).unwrap(); std::fs::write(&test_css, test_content).unwrap();
rustdoc().output(&out_dir).input("foo.rs").arg("--theme").arg(&test_css).run(); rustdoc().output(&out_dir).input("foo.rs").arg("--theme").arg(&test_css).run();
htmldocck().arg(out_dir).arg("foo.rs").status().unwrap().success(); assert!(htmldocck().arg(out_dir).arg("foo.rs").status().unwrap().success());
} }

8
tests/run-make/rustdoc-with-out-dir-option/Makefile
View File

@ -1,8 +0,0 @@
include ../tools.mk
OUTPUT_DIR := "$(TMPDIR)/rustdoc"
all:
$(RUSTDOC) src/lib.rs --crate-name foobar --crate-type lib --out-dir $(OUTPUT_DIR)
$(HTMLDOCCK) $(OUTPUT_DIR) src/lib.rs

7
tests/run-make/rustdoc-with-out-dir-option/rmake.rs Normal file
View File

@ -0,0 +1,7 @@
use run_make_support::{htmldocck, rustdoc, tmp_dir};
fn main() {
let out_dir = tmp_dir().join("rustdoc");
rustdoc().input("src/lib.rs").crate_name("foobar").crate_type("lib").output(&out_dir).run();
assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
}