mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't show HTML diff if tidy isn't installed for rustdoc tests

Browse Source
This commit is contained in:
Guillaume Gomez 2021-03-17 13:48:25 +01:00
parent 4b9f5cc4c1
commit ee98c6fea4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/compiletest/src/main.rs
View File

@ -44,7 +44,7 @@ fn main() {
}
if !config.has_tidy && config.mode == Mode::Rustdoc {
eprintln!("warning: `tidy` is not installed; generated diffs will be harder to read");
eprintln!("warning: `tidy` is not installed; diffs will not be generated");
}
log_config(&config);

9
src/tools/compiletest/src/runtest.rs
View File

@ -2365,6 +2365,9 @@ fn run_rustdoc_test(&self) {
}
fn compare_to_default_rustdoc(&mut self, out_dir: &Path) {
if !self.config.has_tidy {
return;
}
println!("info: generating a diff against nightly rustdoc");
let suffix =
@ -2426,10 +2429,8 @@ fn compare_to_default_rustdoc(&mut self, out_dir: &Path) {
}
}
};
if self.config.has_tidy {
tidy_dir(out_dir);
tidy_dir(&compare_dir);
}
tidy_dir(out_dir);
tidy_dir(&compare_dir);
let pager = {
let output = Command::new("git").args(&["config", "--get", "core.pager"]).output().ok();