From d10703c616fe79522b41b9dc45dd1a97ba655517 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 18 Jul 2021 12:25:49 +0200 Subject: [PATCH 1/2] Fix item info display --- 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 b86f012c0e168..e7a92e638467d 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -921,6 +921,9 @@ body.blur > :not(#help) { padding: 0 20px 20px 17px;; } +.item-info .stab { + display: table; +} .stab { border-width: 1px; border-style: solid; From 57f7501b1d0e276415cefdc1b8fba76563387744 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 18 Jul 2021 12:32:26 +0200 Subject: [PATCH 2/2] Add test to check width of item-info --- src/test/rustdoc-gui/item-info-width.goml | 7 +++++++ src/test/rustdoc-gui/src/lib2/lib.rs | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 src/test/rustdoc-gui/item-info-width.goml diff --git a/src/test/rustdoc-gui/item-info-width.goml b/src/test/rustdoc-gui/item-info-width.goml new file mode 100644 index 0000000000000..44b79e60912c6 --- /dev/null +++ b/src/test/rustdoc-gui/item-info-width.goml @@ -0,0 +1,7 @@ +// This test ensures that the item information don't take 100% of the width if unnecessary. +goto: file://|DOC_PATH|/lib2/struct.Foo.html +// We set a fixed size so there is no chance of "random" resize. +size: (1100, 800) +// We check that ".item-info" is bigger than its content. +assert-css: (".item-info", {"width": "807px"}) +assert-css: (".item-info .stab", {"width": "343px"}) diff --git a/src/test/rustdoc-gui/src/lib2/lib.rs b/src/test/rustdoc-gui/src/lib2/lib.rs index 0466909479b67..cd00348cad3d1 100644 --- a/src/test/rustdoc-gui/src/lib2/lib.rs +++ b/src/test/rustdoc-gui/src/lib2/lib.rs @@ -1,5 +1,7 @@ // ignore-tidy-linelength +#![feature(doc_cfg)] + pub mod module { pub mod sub_module { pub mod sub_sub_module { @@ -14,6 +16,7 @@ pub fn foobar() {} pub type Alias = u32; +#[doc(cfg(feature = "foo-method"))] pub struct Foo { pub x: Alias, }