Skip to content

Commit

Permalink
Rollup merge of #110760 - GuillaumeGomez:regression-60522, r=notriddle
Browse files Browse the repository at this point in the history
rustdoc: Add regression test for #60522

Fixes #60522.

r? `@notriddle`
  • Loading branch information
JohnTitor authored Apr 24, 2023
2 parents 16fdef7 + 5c70287 commit 513c0cc
Showing 1 changed file with 39 additions and 0 deletions.
39 changes: 39 additions & 0 deletions tests/rustdoc/issue-60522-duplicated-glob-reexport.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Regression test for <https://github.com/rust-lang/rust/issues/60522>.
// This test ensures that the `banana` and `peach` modules don't appear twice
// and that the visible modules are not the re-exported ones.

#![crate_name = "foo"]

// @has 'foo/index.html'
// @count - '//*[@id="main-content"]/*[@class="small-section-header"]' 1
// @has - '//*[@id="main-content"]/*[@class="small-section-header"]' 'Modules'
// @count - '//*[@id="main-content"]/*[@class="item-table"]//*[@class="mod"]' 2
// @has - '//*[@id="main-content"]//*[@class="mod"]' 'banana'
// @has - '//*[@id="main-content"]//*[@href="banana/index.html"]' 'banana'
// @has - '//*[@id="main-content"]//*[@class="mod"]' 'peach'
// @has - '//*[@id="main-content"]//*[@href="peach/index.html"]' 'peach'

pub use crate::my_crate::*;

mod my_crate {
pub mod banana {
pub struct Yellow;
}
pub mod peach {
pub struct Pink;
}
}

// @has 'foo/banana/index.html'
// @count - '//*[@id="main-content"]//*[@class="struct"]' 1
// @has - '//*[@id="main-content"]//*[@class="struct"]' 'Brown'
pub mod banana {
pub struct Brown;
}

// @has 'foo/peach/index.html'
// @count - '//*[@id="main-content"]//*[@class="struct"]' 1
// @has - '//*[@id="main-content"]//*[@class="struct"]' 'Pungent'
pub mod peach {
pub struct Pungent;
}

0 comments on commit 513c0cc

Please sign in to comment.