Skip to content
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

Jump to bottom

Rollup of 8 pull requests #103857

Merged
merged 21 commits into from
Nov 2, 2022
Merged

Rollup of 8 pull requests #103857

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift click to select a range
4a92cf6
Derive `Eq` and `Hash` for `ControlFlow`
inquisitivecrystal Oct 15, 2022
368c4a3
Add style= parameter to suggestion attributes
Xiretza Oct 20, 2022
29334b9
rustfmt diagnostic derive tests
Xiretza Oct 20, 2022
20f2958
Add "tool-only" suggestion style
Xiretza Oct 20, 2022
cd621be
Convert all #[suggestion_*] attributes to #[suggestion(style = "...")]
Xiretza Oct 22, 2022
2eeb780
Remove #[suggestion_*] attributes
Xiretza Oct 22, 2022
dad28ad
Add `multivalue` target feature to WASM target
ia0 Oct 27, 2022
5857c30
Use stdio in UWP apps
ChrisDenton Oct 27, 2022
f8a0cc2
compiletest: set the dylib path when gathering target cfg
cuviper Oct 14, 2022
17395b4
Detect unused files in `src/test/mir-opt` and error on them in tidy.
JakobDegen Oct 31, 2022
b20d969
Print valid `--print` requests if request is invalid
Noratrieb Nov 1, 2022
2024f70
Migrate sidebar-links-color GUI test to functions
GuillaumeGomez Nov 1, 2022
a1dfefa
Remove unneeded "rustdoc-preferred-dark-theme" setting
GuillaumeGomez Nov 1, 2022
3aae004
Rollup merge of #103072 - cuviper:compiletest-path, r=Mark-Simulacrum
Manishearth Nov 2, 2022
d4bd794
Rollup merge of #103084 - inquisitivecrystal:control-flow, r=scottmcm
Manishearth Nov 2, 2022
69e7055
Rollup merge of #103575 - Xiretza:suggestions-style-attr, r=davidtwco
Manishearth Nov 2, 2022
65d63ca
Rollup merge of #103637 - ChrisDenton:stdio-uwp, r=thomcc
Manishearth Nov 2, 2022
2cfab1f
Rollup merge of #103638 - ia0:multivalue, r=nagisa
Manishearth Nov 2, 2022
e2a6d28
Rollup merge of #103781 - JakobDegen:mir-opt-tidy, r=jyn514
Manishearth Nov 2, 2022
617f246
Rollup merge of #103837 - GuillaumeGomez:migrate-sidebar-links-color-…
Manishearth Nov 2, 2022
c2affd5
Rollup merge of #103839 - Nilstrieb:print-list, r=compiler-errors
Manishearth Nov 2, 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
386 changes: 162 additions & 224 deletions src/test/rustdoc-gui/sidebar-links-color.goml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,230 4,168 @@ goto: "file://" |DOC_PATH| "/test_docs/struct.Foo.html"
// This is needed so that the text color is computed.
show-text: true

// Ayu theme
local-storage: {
"rustdoc-theme": "ayu",
"rustdoc-use-system-theme": "false",
}
reload:

// Struct
assert-css: (
".sidebar .block.struct a:not(.current)",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.struct a:not(.current)"
assert-css: (
".sidebar .block.struct a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
)
// Enum
assert-css: (
".sidebar .block.enum a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.enum a"
assert-css: (
".sidebar .block.enum a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
)
// Union
assert-css: (
".sidebar .block.union a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.union a"
assert-css: (
".sidebar .block.union a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
)
// Trait
assert-css: (
".sidebar .block.trait a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.trait a"
assert-css: (
".sidebar .block.trait a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
)
// Function
assert-css: (
".sidebar .block.fn a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.fn a"
assert-css: (
".sidebar .block.fn a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
)
// Type definition
assert-css: (
".sidebar .block.type a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.type a"
assert-css: (
".sidebar .block.type a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
)
// Keyword
assert-css: (
".sidebar .block.keyword a",
{"color": "rgb(83, 177, 219)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.keyword a"
assert-css: (
".sidebar .block.keyword a:hover",
{"color": "rgb(255, 180, 76)", "background-color": "rgba(0, 0, 0, 0)"},
)

// Dark theme
local-storage: {"rustdoc-theme": "dark"}
reload:

// Struct
assert-css: (
".sidebar .block.struct a:not(.current)",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.struct a:not(.current)"
assert-css: (
".sidebar .block.struct a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
)
// Enum
assert-css: (
".sidebar .block.enum a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.enum a"
assert-css: (
".sidebar .block.enum a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
)
// Union
assert-css: (
".sidebar .block.union a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.union a"
assert-css: (
".sidebar .block.union a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
define-function: (
"check-colors",
(
theme, struct, struct_hover, struct_hover_background, enum, enum_hover,
enum_hover_background, union, union_hover, union_hover_background, trait, trait_hover,
trait_hover_background, fn, fn_hover, fn_hover_background, type, type_hover,
type_hover_background, keyword, keyword_hover, keyword_hover_background,
),
[
("local-storage", { "rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false" }),
("reload"),
// Struct
("assert-css", (
".sidebar .block.struct a:not(.current)",
{"color": |struct|, "background-color": "rgba(0, 0, 0, 0)"},
)),
("move-cursor-to", ".sidebar .block.struct a:not(.current)"),
("assert-css", (
".sidebar .block.struct a:hover",
{"color": |struct_hover|, "background-color": |struct_hover_background|},
)),
// Enum
("assert-css", (
".sidebar .block.enum a",
{"color": |enum|, "background-color": "rgba(0, 0, 0, 0)"},
)),
("move-cursor-to", ".sidebar .block.enum a"),
("assert-css", (
".sidebar .block.enum a:hover",
{"color": |enum_hover|, "background-color": |enum_hover_background|},
)),
// Union
("assert-css", (
".sidebar .block.union a",
{"color": |union|, "background-color": "rgba(0, 0, 0, 0)"},
)),
("move-cursor-to", ".sidebar .block.union a"),
("assert-css", (
".sidebar .block.union a:hover",
{"color": |union_hover|, "background-color": |union_hover_background|},
)),
// Trait
("assert-css", (
".sidebar .block.trait a",
{"color": |trait|, "background-color": "rgba(0, 0, 0, 0)"},
)),
("move-cursor-to", ".sidebar .block.trait a"),
("assert-css", (
".sidebar .block.trait a:hover",
{"color": |trait_hover|, "background-color": |trait_hover_background|},
)),
// Function
("assert-css", (
".sidebar .block.fn a",
{"color": |fn|, "background-color": "rgba(0, 0, 0, 0)"},
)),
("move-cursor-to", ".sidebar .block.fn a"),
("assert-css", (
".sidebar .block.fn a:hover",
{"color": |fn_hover|, "background-color": |fn_hover_background|},
)),
// Type definition
("assert-css", (
".sidebar .block.type a",
{"color": |type|, "background-color": "rgba(0, 0, 0, 0)"},
)),
("move-cursor-to", ".sidebar .block.type a"),
("assert-css", (
".sidebar .block.type a:hover",
{"color": |type_hover|, "background-color": |type_hover_background|},
)),
// Keyword
("assert-css", (
".sidebar .block.keyword a",
{"color": |keyword|, "background-color": "rgba(0, 0, 0, 0)"},
)),
("move-cursor-to", ".sidebar .block.keyword a"),
("assert-css", (
".sidebar .block.keyword a:hover",
{"color": |keyword_hover|, "background-color": |keyword_hover_background|},
)),
]
)
// Trait
assert-css: (
".sidebar .block.trait a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.trait a"
assert-css: (
".sidebar .block.trait a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
)
// Function
assert-css: (
".sidebar .block.fn a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.fn a"
assert-css: (
".sidebar .block.fn a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
)
// Type definition
assert-css: (
".sidebar .block.type a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.type a"
assert-css: (
".sidebar .block.type a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
)
// Keyword
assert-css: (
".sidebar .block.keyword a",
{"color": "rgb(253, 191, 53)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.keyword a"
assert-css: (
".sidebar .block.keyword a:hover",
{"color": "rgb(253, 191, 53)", "background-color": "rgb(68, 68, 68)"},
)

// Light theme
local-storage: {"rustdoc-theme": "light"}
reload:

// Struct
assert-css: (
".sidebar .block.struct a:not(.current)",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.struct a:not(.current)"
assert-css: (
".sidebar .block.struct a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
)
// Enum
assert-css: (
".sidebar .block.enum a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.enum a"
assert-css: (
".sidebar .block.enum a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
)
// Union
assert-css: (
".sidebar .block.union a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.union a"
assert-css: (
".sidebar .block.union a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
)
// Trait
assert-css: (
".sidebar .block.trait a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.trait a"
assert-css: (
".sidebar .block.trait a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
)
// Function
assert-css: (
".sidebar .block.fn a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.fn a"
assert-css: (
".sidebar .block.fn a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
)
// Type definition
assert-css: (
".sidebar .block.type a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.type a"
assert-css: (
".sidebar .block.type a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
)
// Keyword
assert-css: (
".sidebar .block.keyword a",
{"color": "rgb(53, 109, 164)", "background-color": "rgba(0, 0, 0, 0)"},
)
move-cursor-to: ".sidebar .block.keyword a"
assert-css: (
".sidebar .block.keyword a:hover",
{"color": "rgb(53, 109, 164)", "background-color": "rgb(255, 255, 255)"},
call-function: (
"check-colors",
{
"theme": "ayu",
"struct": "rgb(83, 177, 219)",
"struct_hover": "rgb(255, 180, 76)",
"struct_hover_background": "rgba(0, 0, 0, 0)",
"enum": "rgb(83, 177, 219)",
"enum_hover": "rgb(255, 180, 76)",
"enum_hover_background": "rgba(0, 0, 0, 0)",
"union": "rgb(83, 177, 219)",
"union_hover": "rgb(255, 180, 76)",
"union_hover_background": "rgba(0, 0, 0, 0)",
"trait": "rgb(83, 177, 219)",
"trait_hover": "rgb(255, 180, 76)",
"trait_hover_background": "rgba(0, 0, 0, 0)",
"fn": "rgb(83, 177, 219)",
"fn_hover": "rgb(255, 180, 76)",
"fn_hover_background": "rgba(0, 0, 0, 0)",
"type": "rgb(83, 177, 219)",
"type_hover": "rgb(255, 180, 76)",
"type_hover_background": "rgba(0, 0, 0, 0)",
"keyword": "rgb(83, 177, 219)",
"keyword_hover": "rgb(255, 180, 76)",
"keyword_hover_background": "rgba(0, 0, 0, 0)",
}
)
call-function: (
"check-colors",
{
"theme": "dark",
"struct": "rgb(253, 191, 53)",
"struct_hover": "rgb(253, 191, 53)",
"struct_hover_background": "rgb(68, 68, 68)",
"enum": "rgb(253, 191, 53)",
"enum_hover": "rgb(253, 191, 53)",
"enum_hover_background": "rgb(68, 68, 68)",
"union": "rgb(253, 191, 53)",
"union_hover": "rgb(253, 191, 53)",
"union_hover_background": "rgb(68, 68, 68)",
"trait": "rgb(253, 191, 53)",
"trait_hover": "rgb(253, 191, 53)",
"trait_hover_background": "rgb(68, 68, 68)",
"fn": "rgb(253, 191, 53)",
"fn_hover": "rgb(253, 191, 53)",
"fn_hover_background": "rgb(68, 68, 68)",
"type": "rgb(253, 191, 53)",
"type_hover": "rgb(253, 191, 53)",
"type_hover_background": "rgb(68, 68, 68)",
"keyword": "rgb(253, 191, 53)",
"keyword_hover": "rgb(253, 191, 53)",
"keyword_hover_background": "rgb(68, 68, 68)",
}
)
call-function: (
"check-colors",
{
"theme": "light",
"struct": "rgb(53, 109, 164)",
"struct_hover": "rgb(53, 109, 164)",
"struct_hover_background": "rgb(255, 255, 255)",
"enum": "rgb(53, 109, 164)",
"enum_hover": "rgb(53, 109, 164)",
"enum_hover_background": "rgb(255, 255, 255)",
"union": "rgb(53, 109, 164)",
"union_hover": "rgb(53, 109, 164)",
"union_hover_background": "rgb(255, 255, 255)",
"trait": "rgb(53, 109, 164)",
"trait_hover": "rgb(53, 109, 164)",
"trait_hover_background": "rgb(255, 255, 255)",
"fn": "rgb(53, 109, 164)",
"fn_hover": "rgb(53, 109, 164)",
"fn_hover_background": "rgb(255, 255, 255)",
"type": "rgb(53, 109, 164)",
"type_hover": "rgb(53, 109, 164)",
"type_hover_background": "rgb(255, 255, 255)",
"keyword": "rgb(53, 109, 164)",
"keyword_hover": "rgb(53, 109, 164)",
"keyword_hover_background": "rgb(255, 255, 255)",
}
)
Loading