From 2378227d73cf35185ec9e32f55520f40891f170b Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 24 Dec 2023 19:23:27 +0100 Subject: [PATCH 1/3] Update browser-ui-test version to 0.16.11 --- .../docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version b/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version index 50b6386a009..a2b63962ba1 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version +++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version @@ -1 +1 @@ -0.16.10 \ No newline at end of file +0.16.11 \ No newline at end of file From 279b11c4b50236647c1f6cb11329bfd74dba476e Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 24 Dec 2023 19:23:42 +0100 Subject: [PATCH 2/3] Fix display of warning block if it is first element of the top doc block --- src/librustdoc/html/static/css/rustdoc.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 6e673aa77c5..665bb5d42bc 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -1367,6 +1367,9 @@ documentation. */ font-weight: bold; font-size: 1.25rem; } +.top-doc > .docblock >.warning:first-child::before { + top: 20px; +} a.test-arrow { visibility: hidden; From 98b71bf345e682d5c50277ced28e77d33e1794cb Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 24 Dec 2023 19:24:04 +0100 Subject: [PATCH 3/3] Add GUI regression test for position of warning block --- tests/rustdoc-gui/src/test_docs/lib.rs | 3 +++ tests/rustdoc-gui/warning-block.goml | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/tests/rustdoc-gui/src/test_docs/lib.rs b/tests/rustdoc-gui/src/test_docs/lib.rs index 0bc777230bf..7e34178e56f 100644 --- a/tests/rustdoc-gui/src/test_docs/lib.rs +++ b/tests/rustdoc-gui/src/test_docs/lib.rs @@ -85,6 +85,9 @@ fn as_ref(&self) -> &str { } } +///
I have warnings!
+pub struct WarningStruct; + /// Just a normal enum. /// /// # title! diff --git a/tests/rustdoc-gui/warning-block.goml b/tests/rustdoc-gui/warning-block.goml index 8832b65c4d8..10e206049f5 100644 --- a/tests/rustdoc-gui/warning-block.goml +++ b/tests/rustdoc-gui/warning-block.goml @@ -2,6 +2,7 @@ go-to: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html" show-text: true +store-value: (default_y_pos, 5) define-function: ( "check-warning", (theme, color, border_color), @@ -16,12 +17,18 @@ define-function: ( "border-left": "2px solid " + |border_color|, "background-color": "transparent", }) + store-position: ("#doc-warning-1", {"y": warn_div_y}) + store-position: ("#doc-warning-1::before", {"y": warn_y}) + assert: |warn_y| == |warn_div_y| + |default_y_pos| assert-css: ("#doc-warning-2", { "margin-bottom": "0px", "color": |color|, "border-left": "2px solid " + |border_color|, "background-color": "transparent", }) + store-position: ("#doc-warning-2", {"y": warn_div_y}) + store-position: ("#doc-warning-2::before", {"y": warn_y}) + assert: |warn_y| == |warn_div_y| + |default_y_pos| }, ) @@ -40,3 +47,9 @@ call-function: ("check-warning", { "color": "black", "border_color": "#ff8e00", }) + +// We ensure that the warning element in the top doc is not overlaying the "[-]" button. +go-to: "file://" + |DOC_PATH| + "/test_docs/struct.WarningStruct.html" +store-position: ("#doc-warning-0", {"y": warn_div_y}) +store-position: ("#doc-warning-0::before", {"y": warn_y}) +assert: |warn_y| == |warn_div_y| + |default_y_pos| + 15