Skip to content

Commit 759a8ae

Browse files
authored
Rollup merge of #90097 - GuillaumeGomez:duplicated-sidebar-entry-reexported-macro, r=notriddle
Add test for duplicated sidebar entries for reexported macro Fixes #90015. r? ````@notriddle````
2 parents e4cfaa1 + 50dc319 commit 759a8ae

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// This test ensures that the reexport of a macro doesn't make the original macro
2+
// displayed twice in the sidebar.
3+
goto: file://|DOC_PATH|/test_docs/macro.repro.html
4+
wait-for: ".sidebar-elems .macro .macro"
5+
assert-count: ("//*[@class='sidebar-elems']//*[@class='block macro']//a[text()='repro']", 1)

src/test/rustdoc-gui/sidebar.goml

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ assert-text: (".sidebar-elems > #all-types", "See all test_docs's items")
77
assert-text: (".sidebar-elems > .crate > ul > li > a.current", "test_docs")
88
// And we're also supposed to have the list of items in the current module.
99
assert-text: (".sidebar-elems > .items > ul > li:nth-child(1)", "Modules")
10-
assert-text: (".sidebar-elems > .items > ul > li:nth-child(2)", "Structs")
11-
assert-text: (".sidebar-elems > .items > ul > li:nth-child(3)", "Enums")
12-
assert-text: (".sidebar-elems > .items > ul > li:nth-child(4)", "Traits")
13-
assert-text: (".sidebar-elems > .items > ul > li:nth-child(5)", "Functions")
14-
assert-text: (".sidebar-elems > .items > ul > li:nth-child(6)", "Type Definitions")
15-
assert-text: (".sidebar-elems > .items > ul > li:nth-child(7)", "Keywords")
10+
assert-text: (".sidebar-elems > .items > ul > li:nth-child(2)", "Macros")
11+
assert-text: (".sidebar-elems > .items > ul > li:nth-child(3)", "Structs")
12+
assert-text: (".sidebar-elems > .items > ul > li:nth-child(4)", "Enums")
13+
assert-text: (".sidebar-elems > .items > ul > li:nth-child(5)", "Traits")
14+
assert-text: (".sidebar-elems > .items > ul > li:nth-child(6)", "Functions")
15+
assert-text: (".sidebar-elems > .items > ul > li:nth-child(7)", "Type Definitions")
16+
assert-text: (".sidebar-elems > .items > ul > li:nth-child(8)", "Keywords")
1617
assert-text: ("#structs + .item-table .item-left > a", "Foo")
1718
click: "#structs + .item-table .item-left > a"
1819

src/test/rustdoc-gui/src/test_docs/lib.rs

+7
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,10 @@ pub mod huge_amount_of_consts {
124124

125125
/// Very long code text `hereIgoWithLongTextBecauseWhyNotAndWhyWouldntI`.
126126
pub mod long_code_block {}
127+
128+
#[macro_export]
129+
macro_rules! repro {
130+
() => {};
131+
}
132+
133+
pub use crate::repro as repro2;

0 commit comments

Comments
 (0)