OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add test when trying to add new theme

Browse Source
This commit is contained in:
Guillaume Gomez 2018-01-25 23:31:48 +01:00
parent 583b29f85c
commit 9ee69818f7
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/librustdoc/lib.rs
View File

@ -398,12 +398,23 @@ pub fn main_args(args: &[String]) -> isize {
}
let mut themes = Vec::new();
for theme in matches.opt_strs("themes").iter().map(|s| PathBuf::from(&s)) {
if !theme.is_file() {
eprintln!("rustdoc: option --themes arguments must all be files");
return 1;
if matches.opt_present("themes") {
let pathes = theme::load_css_pathes(include_bytes!("html/static/themes/main.css"));
for (theme_file, theme_s) in matches.opt_strs("themes")
.iter()
.map(|s| (PathBuf::from(&s), s.to_owned())) {
if !theme_file.is_file() {
eprintln!("rustdoc: option --themes arguments must all be files");
return 1;
}
if !theme::test_theme_against(&theme_file, &pathes).is_empty() {
eprintln!("rustdoc: invalid theme: \"{}\"", theme_s);
eprintln!(" Check what's wrong with the \"theme-checker\" option");
return 1;
}
themes.push(theme_file);
}
themes.push(theme);
}
let external_html = match ExternalHtml::load(