From 20010d759718ade4ae33a173539ff808854ac269 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Thu, 5 May 2022 17:20:14 -0700 Subject: rustdoc: ensure HTML/JS side implementors don't have dups --- src/test/rustdoc-gui/implementors.goml | 7 +++++++ src/test/rustdoc-gui/src/lib2/implementors/lib.rs | 9 +++++++++ src/test/rustdoc-gui/src/lib2/lib.rs | 7 +++++++ 3 files changed, 23 insertions(+) (limited to 'src/test/rustdoc-gui') diff --git a/src/test/rustdoc-gui/implementors.goml b/src/test/rustdoc-gui/implementors.goml index 6460a917e92..ccc69cc6bd7 100644 --- a/src/test/rustdoc-gui/implementors.goml +++ b/src/test/rustdoc-gui/implementors.goml @@ -18,3 +18,10 @@ assert: "#implementors-list .impl:nth-child(2) > .code-header.in-band" goto: file://|DOC_PATH|/test_docs/struct.HasEmptyTraits.html compare-elements-position-near-false: ("#impl-EmptyTrait1", "#impl-EmptyTrait2", {"y": 30}) compare-elements-position-near: ("#impl-EmptyTrait3 h3", "#impl-EmptyTrait3 .item-info", {"y": 30}) + +// Now check that re-exports work correctly. +// There should be exactly one impl shown on both of these pages. +goto: file://|DOC_PATH|/lib2/trait.TraitToReexport.html +assert-count: ("#implementors-list .impl", 1) +goto: file://|DOC_PATH|/implementors/trait.TraitToReexport.html +assert-count: ("#implementors-list .impl", 1) \ No newline at end of file diff --git a/src/test/rustdoc-gui/src/lib2/implementors/lib.rs b/src/test/rustdoc-gui/src/lib2/implementors/lib.rs index 6417a6ac5af..1620e842291 100644 --- a/src/test/rustdoc-gui/src/lib2/implementors/lib.rs +++ b/src/test/rustdoc-gui/src/lib2/implementors/lib.rs @@ -9,3 +9,12 @@ pub struct Struct; impl Whatever for Struct { type Foo = u8; } + +mod traits { + pub trait TraitToReexport { + fn method() {} + } +} + +#[doc(inline)] +pub use traits::TraitToReexport; diff --git a/src/test/rustdoc-gui/src/lib2/lib.rs b/src/test/rustdoc-gui/src/lib2/lib.rs index 83e86c43934..d06b46f952d 100644 --- a/src/test/rustdoc-gui/src/lib2/lib.rs +++ b/src/test/rustdoc-gui/src/lib2/lib.rs @@ -43,6 +43,13 @@ impl implementors::Whatever for Foo { type Foo = u32; } +#[doc(inline)] +pub use implementors::TraitToReexport; + +pub struct StructToImplOnReexport; + +impl TraitToReexport for StructToImplOnReexport {} + pub mod sub_mod { /// ```txt /// aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -- cgit 1.4.1-3-g733a5 From bd11e22203c0d7bb87375a3a39c53649af50593c Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Fri, 6 May 2022 05:18:32 -0700 Subject: Add missing newline --- src/test/rustdoc-gui/implementors.goml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/rustdoc-gui') diff --git a/src/test/rustdoc-gui/implementors.goml b/src/test/rustdoc-gui/implementors.goml index ccc69cc6bd7..f29613f78b1 100644 --- a/src/test/rustdoc-gui/implementors.goml +++ b/src/test/rustdoc-gui/implementors.goml @@ -24,4 +24,4 @@ compare-elements-position-near: ("#impl-EmptyTrait3 h3", "#impl-EmptyTrait3 .ite goto: file://|DOC_PATH|/lib2/trait.TraitToReexport.html assert-count: ("#implementors-list .impl", 1) goto: file://|DOC_PATH|/implementors/trait.TraitToReexport.html -assert-count: ("#implementors-list .impl", 1) \ No newline at end of file +assert-count: ("#implementors-list .impl", 1) -- cgit 1.4.1-3-g733a5