bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stabilize rustdoc theme options

Browse source
This commit is contained in:
Guillaume Gomez 2018-10-01 22:28:12 +02:00
parent 9b0214d9c5
commit add6204484
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustdoc/config.rs
View file

@ -364,7 +364,9 @@ impl Options {
.iter() .iter()
.map(|s| (PathBuf::from(&s), s.to_owned())) { .map(|s| (PathBuf::from(&s), s.to_owned())) {
if !theme_file.is_file() { if !theme_file.is_file() {
diag.struct_err("option --themes arguments must all be files").emit(); diag.struct_err(&format!("invalid file: \"{}\"", theme_s))
.help("option --themes arguments must all be files")
.emit();
return Err(1); return Err(1);
} }
let (success, ret) = theme::test_theme_against(&theme_file, &paths, &diag); let (success, ret) = theme::test_theme_against(&theme_file, &paths, &diag);

4
src/librustdoc/lib.rs
View file

@ -251,12 +251,12 @@ fn opts() -> Vec<RustcOptGroup> {
o.optflag("", "sort-modules-by-appearance", "sort modules by where they appear in the \ o.optflag("", "sort-modules-by-appearance", "sort modules by where they appear in the \
program, rather than alphabetically") program, rather than alphabetically")
}), }),
unstable("themes", |o| { stable("themes", |o| {
o.optmulti("", "themes", o.optmulti("", "themes",
"additional themes which will be added to the generated docs", "additional themes which will be added to the generated docs",
"FILES") "FILES")
}), }),
unstable("theme-checker", |o| { stable("theme-checker", |o| {
o.optmulti("", "theme-checker", o.optmulti("", "theme-checker",
"check if given theme is valid", "check if given theme is valid",
"FILES") "FILES")