diff options
| author | bors <bors@rust-lang.org> | 2024-04-05 02:32:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-05 02:32:03 +0000 |
| commit | 3d7e88148a00c99e444c8f287d73ebe1846bc7aa (patch) | |
| tree | 9c2e5865bef6f074b6460e36d332f4db3d78f25d /src/tools | |
| parent | 9cbaa015991b7ac5f6e1b4d713ab9096573ad30d (diff) | |
| parent | e8b0c3057807e50ac1f95fdba36d79b72fbd206d (diff) | |
| download | rust-3d7e88148a00c99e444c8f287d73ebe1846bc7aa.tar.gz rust-3d7e88148a00c99e444c8f287d73ebe1846bc7aa.zip | |
Auto merge of #123484 - jhpratt:rollup-usz4e64, r=jhpratt
Rollup of 9 pull requests Successful merges: - #123206 (Require Pointee::Metadata to be Freeze) - #123363 (change `NormalizesTo` to fully structurally normalize) - #123407 (Default to light theme if JS is enabled but not working) - #123417 (Add Description for cargo in rustdoc documentation) - #123437 (Manually run `clang-format` on `CoverageMappingWrapper.cpp`) - #123454 (hir: Use `ItemLocalId::ZERO` in a couple more places) - #123464 (Cleanup: Rename `HAS_PROJECTIONS` to `HAS_ALIASES` etc.) - #123477 (do not ICE in `fn forced_ambiguity` if we get an error) - #123478 (CFI: Add test for `call_once` addr taken) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tidy/src/rustdoc_css_themes.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/tidy/src/rustdoc_css_themes.rs b/src/tools/tidy/src/rustdoc_css_themes.rs index 852d6e14e91..af36f9ba58e 100644 --- a/src/tools/tidy/src/rustdoc_css_themes.rs +++ b/src/tools/tidy/src/rustdoc_css_themes.rs @@ -74,8 +74,11 @@ fn compare_themes<'a>( (noscript_css_line_number, noscript_css_line), ) in rustdoc_css_lines.zip(noscript_css_lines) { - if noscript_css_line.starts_with(":root {") - && rustdoc_css_line.starts_with(&format!(r#":root[data-theme="{name}"] {{"#)) + if noscript_css_line.starts_with(":root, :root:not([data-theme]) {") + && (rustdoc_css_line.starts_with(&format!(r#":root[data-theme="{name}"] {{"#)) + || rustdoc_css_line.starts_with(&format!( + r#":root[data-theme="{name}"], :root:not([data-theme]) {{"# + ))) { // selectors are different between rustdoc.css and noscript.css // that's why they both exist: one uses JS, the other uses media queries |