Skip to content

Extend CSS check to CSS variables #101813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 5 commits into from
Sep 16, 2022
Merged

Extend CSS check to CSS variables #101813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb42dae
Simplify CSS parser to check themes
GuillaumeGomez Sep 14, 2022
0b037c1
Update theme check tests
GuillaumeGomez Sep 14, 2022
e7d8ad6
Add check for missing CSS variables
GuillaumeGomez Sep 14, 2022
a528f68
Remove duplicate warnings
GuillaumeGomez Sep 14, 2022
d3529ce
Correctly handle parens
GuillaumeGomez Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/librustdoc/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,13 @@ impl Options {

let to_check = matches.opt_strs("check-theme");
if !to_check.is_empty() {
let paths = theme::load_css_paths(static_files::themes::LIGHT.as_bytes());
let paths = match theme::load_css_paths(static_files::themes::LIGHT) {
Ok(p) => p,
Err(e) => {
diag.struct_err(&e.to_string()).emit();
return Err(1);
}
};
let mut errors = 0;

println!("rustdoc: [check-theme] Starting tests! (Ignoring all other arguments)");
Expand Down Expand Up @@ -547,7 +553,13 @@ impl Options {

let mut themes = Vec::new();
if matches.opt_present("theme") {
let paths = theme::load_css_paths(static_files::themes::LIGHT.as_bytes());
let paths = match theme::load_css_paths(static_files::themes::LIGHT) {
Ok(p) => p,
Err(e) => {
diag.struct_err(&e.to_string()).emit();
return Err(1);
}
};

for (theme_file, theme_s) in
matches.opt_strs("theme").iter().map(|s| (PathBuf::from(&s), s.to_owned()))
Expand Down
Loading