-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #111095 - GuillaumeGomez:fix-assoc-item-trait-inside-…
…hidden, r=notriddle Correctly handle associated items of a trait inside a `#[doc(hidden)]` item Fixes #111064. cc `@compiler-errors` r? `@notriddle`
- Loading branch information
Showing
7 changed files
with
162 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
tests/rustdoc/issue-111064-reexport-trait-from-hidden-2.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
#![feature(no_core)] | ||
#![no_core] | ||
#![crate_name = "foo"] | ||
|
||
// @!has 'foo/hidden/index.html' | ||
// FIXME: add missing `@` for the two next tests once issue is fixed! | ||
// To be done in <https://github.com/rust-lang/rust/issues/111249>. | ||
// !has 'foo/hidden/inner/index.html' | ||
// !has 'foo/hidden/inner/trait.Foo.html' | ||
#[doc(hidden)] | ||
pub mod hidden { | ||
pub mod inner { | ||
pub trait Foo { | ||
/// Hello, world! | ||
fn test(); | ||
} | ||
} | ||
} | ||
|
||
// @has 'foo/visible/index.html' | ||
// @has 'foo/visible/trait.Foo.html' | ||
#[doc(inline)] | ||
pub use hidden::inner as visible; | ||
|
||
// @has 'foo/struct.Bar.html' | ||
// @count - '//*[@id="impl-Foo-for-Bar"]' 1 | ||
pub struct Bar; | ||
|
||
impl visible::Foo for Bar { | ||
fn test() {} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// Regression test for <https://github.com/rust-lang/rust/issues/111064>. | ||
// Methods from a re-exported trait inside a `#[doc(hidden)]` item should | ||
// be visible. | ||
|
||
#![crate_name = "foo"] | ||
|
||
// @has 'foo/index.html' | ||
// @has - '//*[@id="main-content"]//*[@class="item-name"]/a[@href="trait.Foo.html"]' 'Foo' | ||
|
||
// @has 'foo/trait.Foo.html' | ||
// @has - '//*[@id="main-content"]//*[@class="code-header"]' 'fn test()' | ||
|
||
#[doc(hidden)] | ||
mod hidden { | ||
pub trait Foo { | ||
/// Hello, world! | ||
fn test(); | ||
} | ||
} | ||
|
||
pub use hidden::Foo; |