diff options
| author | bors <bors@rust-lang.org> | 2021-12-31 22:57:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-31 22:57:51 +0000 |
| commit | 4d2e0fd96ccbb9ade41f1a3f07b14b7437f8e4ef (patch) | |
| tree | ae02e3e70631489b0ee454b28b13242f8ecdc4ea /src/test/rustdoc-gui | |
| parent | cfa3fe5af339e724209b25715282adae0c61628f (diff) | |
| parent | 2da54c729ecd3ad6a4557ccc6b4f9e6ef8632ae2 (diff) | |
Auto merge of #92465 - matthiaskrgr:rollup-yuary84, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #90383 (Extend check for UnsafeCell in consts to cover unions) - #91375 (config.rs: Add support for a per-target default_linker option.) - #91480 (rustdoc: use smaller number of colors to distinguish items) - #92338 (Add try_reserve and try_reserve_exact for OsString) - #92405 (Add a couple needs-asm-support headers to tests) - #92435 (Sync rustc_codegen_cranelift) - #92440 (Fix mobile toggles position) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/rustdoc-gui')
| -rw-r--r-- | src/test/rustdoc-gui/anchors.goml | 2 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/font-weight.goml | 4 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/toggle-docs-mobile.goml | 10 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/test/rustdoc-gui/anchors.goml b/src/test/rustdoc-gui/anchors.goml index 2216b3f1c97..ca60be72cea 100644 --- a/src/test/rustdoc-gui/anchors.goml +++ b/src/test/rustdoc-gui/anchors.goml @@ -12,7 +12,7 @@ reload: assert-css: ("#toggle-all-docs", {"color": "rgb(0, 0, 0)"}) assert-css: (".fqn .in-band a:nth-of-type(1)", {"color": "rgb(0, 0, 0)"}) -assert-css: (".fqn .in-band a:nth-of-type(2)", {"color": "rgb(173, 68, 142)"}) +assert-css: (".fqn .in-band a:nth-of-type(2)", {"color": "rgb(173, 55, 138)"}) assert-css: (".srclink", {"color": "rgb(0, 0, 0)"}) assert-css: (".srclink", {"color": "rgb(0, 0, 0)"}) diff --git a/src/test/rustdoc-gui/font-weight.goml b/src/test/rustdoc-gui/font-weight.goml index c9117e2c101..a64ac8b422f 100644 --- a/src/test/rustdoc-gui/font-weight.goml +++ b/src/test/rustdoc-gui/font-weight.goml @@ -37,8 +37,8 @@ assert-css: ( {"font-weight": "400"}, ) -assert-count: (".methods .type", 1) -assert-css: (".methods .type", {"font-weight": "600"}) +assert-count: (".methods .associatedtype", 1) +assert-css: (".methods .associatedtype", {"font-weight": "600"}) assert-count: (".methods .constant", 1) assert-css: (".methods .constant", {"font-weight": "600"}) assert-css: (".methods .method", {"font-weight": "600"}) diff --git a/src/test/rustdoc-gui/toggle-docs-mobile.goml b/src/test/rustdoc-gui/toggle-docs-mobile.goml index 471d88701d4..b370dd012fa 100644 --- a/src/test/rustdoc-gui/toggle-docs-mobile.goml +++ b/src/test/rustdoc-gui/toggle-docs-mobile.goml @@ -9,6 +9,16 @@ assert-attribute: (".top-doc", {"open": ""}) click: (3, 280) assert-attribute: (".top-doc", {"open": ""}) +// Assert the position of the toggle on the top doc block. +assert-position: (".top-doc summary::before", {"x": 4}) +// Assert the position of the toggle on the impl block. +assert-position: ("#implementations + details > summary::before", {"x": 4}) +// Assert the position of the toggle on a method. +assert-position: ( + "#trait-implementations-list .impl-items .method-toggle > summary::before", + {"x": 4}, +) + // Now we do the same but with a little bigger width size: (600, 600) assert-attribute: (".top-doc", {"open": ""}) |