about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2021-07-19 11:37:46 +0200
committerGitHub <noreply@github.com>2021-07-19 11:37:46 +0200
commit8cf995f6acb70cb09f14080df4d1232f736b2fc5 (patch)
tree351d79758808a4a2a8c887d161dbbde01e4fd97c /src/test
parent6df9df7e36ca40e8e30e107761e8d2763fc13864 (diff)
parent57f7501b1d0e276415cefdc1b8fba76563387744 (diff)
downloadrust-8cf995f6acb70cb09f14080df4d1232f736b2fc5.tar.gz
rust-8cf995f6acb70cb09f14080df4d1232f736b2fc5.zip
Rollup merge of #87251 - GuillaumeGomez:item-info-width, r=notriddle
Fix "item info" width

Fixes #87202.

It now looks again like this:

![Screenshot from 2021-07-18 12-33-27](https://user-images.githubusercontent.com/3050060/126064005-013acabc-7f17-4436-8dfc-cb6b9bc24413.png)

cc `@jyn514`

r? `@notriddle`
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc-gui/item-info-width.goml7
-rw-r--r--src/test/rustdoc-gui/src/lib2/lib.rs3
2 files changed, 10 insertions, 0 deletions
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 00000000000..44b79e60912
--- /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 0466909479b..cd00348cad3 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,
 }