diff options
| author | bors <bors@rust-lang.org> | 2022-04-06 03:45:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-06 03:45:36 +0000 |
| commit | 5da76eeaad7b57eaee81fc28067952f96abf8377 (patch) | |
| tree | c2cc39f826782ce19f6001d93e0f430810aea709 /src/test/rustdoc-gui | |
| parent | 26b5e0cbb95ce5b1cbf91d49fb45d122479e3363 (diff) | |
| parent | b4527492b1630c18deb7206ec703d71a372da664 (diff) | |
| download | rust-5da76eeaad7b57eaee81fc28067952f96abf8377.tar.gz rust-5da76eeaad7b57eaee81fc28067952f96abf8377.zip | |
Auto merge of #95711 - Dylan-DPC:rollup-ujss3oi, r=Dylan-DPC
Rollup of 4 pull requests Successful merges: - #95659 (Rely on #[link] attribute for unwind on Fuchsia.) - #95684 (rustdoc: Fix item info display overflow) - #95693 (interp: pass TyCtxt to Machine methods that do not take InterpCx) - #95699 (fix: Vec leak when capacity is 0) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/rustdoc-gui')
| -rw-r--r-- | src/test/rustdoc-gui/item-info-overflow.goml | 28 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/src/lib2/lib.rs | 10 |
2 files changed, 38 insertions, 0 deletions
diff --git a/src/test/rustdoc-gui/item-info-overflow.goml b/src/test/rustdoc-gui/item-info-overflow.goml new file mode 100644 index 00000000000..4ff719bfb7d --- /dev/null +++ b/src/test/rustdoc-gui/item-info-overflow.goml @@ -0,0 +1,28 @@ +// This test ensures that the "item-info" elements don't overflow. +goto: file://|DOC_PATH|/lib2/struct.LongItemInfo.html +// We set a fixed size so there is no chance of "random" resize. +size: (1200, 870) +// Logically, the "item-decl" and the "item-info" should have the same scroll width. +compare-elements-property: (".docblock.item-decl", ".item-info", ["scrollWidth"]) +assert-property: (".item-info", {"scrollWidth": "890"}) +// Just to be sure we're comparing the correct "item-info": +assert-text: ( + ".item-info", + "This is supported on Android or Linux or Emscripten or DragonFly BSD", + STARTS_WITH, +) + +// Checking the "item-info" on an impl block as well: +goto: file://|DOC_PATH|/lib2/struct.LongItemInfo2.html +compare-elements-property: ( + "#impl-SimpleTrait .item-info", + "#impl-SimpleTrait + .docblock", + ["scrollWidth"], +) +assert-property: ("#impl-SimpleTrait .item-info", {"scrollWidth": "866"}) +// Just to be sure we're comparing the correct "item-info": +assert-text: ( + "#impl-SimpleTrait .item-info", + "This is supported on Android or Linux or Emscripten or DragonFly BSD", + STARTS_WITH, +) diff --git a/src/test/rustdoc-gui/src/lib2/lib.rs b/src/test/rustdoc-gui/src/lib2/lib.rs index 5b6d236e8e0..83e86c43934 100644 --- a/src/test/rustdoc-gui/src/lib2/lib.rs +++ b/src/test/rustdoc-gui/src/lib2/lib.rs @@ -120,3 +120,13 @@ pub struct HasALongTraitWithParams {} pub trait LongTraitWithParamsBananaBananaBanana<T> {} impl LongTraitWithParamsBananaBananaBanana<usize> for HasALongTraitWithParams {} + +#[doc(cfg(any(target_os = "android", target_os = "linux", target_os = "emscripten", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd")))] +pub struct LongItemInfo; + +pub trait SimpleTrait {} +pub struct LongItemInfo2; + +/// Some docs. +#[doc(cfg(any(target_os = "android", target_os = "linux", target_os = "emscripten", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd")))] +impl SimpleTrait for LongItemInfo2 {} |
