bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #83705 - jyn514:theme-error, r=GuillaumeGomez

Browse source 
Give a better error when --theme is not a CSS file

Before:

```
error: invalid argument: "bacon.toml"
```

After:
```
error: invalid argument: "bacon.toml"
  |
  = help: arguments to --theme must be CSS files
```

cc https://github.com/rust-lang/rust/pull/83478
This commit is contained in:
Dylan DPC 2021-04-05 15:48:42 +02:00 • committed by GitHub
commit a766d63b2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustdoc/config.rs
View file

@ -484,7 +484,9 @@ impl Options {
return Err(1);
}
if theme_file.extension() != Some(OsStr::new("css")) {
diag.struct_err(&format!("invalid argument: \"{}\"", theme_s)).emit();
diag.struct_err(&format!("invalid argument: \"{}\"", theme_s))
.help("arguments to --theme must have a .css extension")
.emit();
return Err(1);
}
let (success, ret) = theme::test_theme_against(&theme_file, &paths, &diag);