-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #83900 - torhovland:issue-83832, r=jyn514
Add stability tags to ImportItem. Fixes #83832.
- Loading branch information
Showing
7 changed files
with
153 additions
and
9 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
48 changes: 48 additions & 0 deletions
48
src/test/rustdoc/reexport-stability-tags-deprecated-and-portability.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,48 @@ | ||
#![crate_name = "foo"] | ||
#![feature(doc_cfg)] | ||
|
||
pub mod tag { | ||
#[deprecated(since = "0.1.8", note = "Use bar() instead")] | ||
pub trait Deprecated {} | ||
|
||
#[doc(cfg(feature = "sync"))] | ||
pub trait Portability {} | ||
|
||
#[deprecated(since = "0.1.8", note = "Use bar() instead")] | ||
#[doc(cfg(feature = "sync"))] | ||
pub trait Both {} | ||
|
||
pub trait None {} | ||
} | ||
|
||
// @has foo/mod1/index.html | ||
pub mod mod1 { | ||
// @has - '//code' 'pub use tag::Deprecated;' | ||
// @has - '//span' 'Deprecated' | ||
// @!has - '//span' 'sync' | ||
pub use tag::Deprecated; | ||
} | ||
|
||
// @has foo/mod2/index.html | ||
pub mod mod2 { | ||
// @has - '//code' 'pub use tag::Portability;' | ||
// @!has - '//span' 'Deprecated' | ||
// @has - '//span' 'sync' | ||
pub use tag::Portability; | ||
} | ||
|
||
// @has foo/mod3/index.html | ||
pub mod mod3 { | ||
// @has - '//code' 'pub use tag::Both;' | ||
// @has - '//span' 'Deprecated' | ||
// @has - '//span' 'sync' | ||
pub use tag::Both; | ||
} | ||
|
||
// @has foo/mod4/index.html | ||
pub mod mod4 { | ||
// @has - '//code' 'pub use tag::None;' | ||
// @!has - '//span' 'Deprecated' | ||
// @!has - '//span' 'sync' | ||
pub use tag::None; | ||
} |
61 changes: 61 additions & 0 deletions
61
src/test/rustdoc/reexport-stability-tags-unstable-and-portability.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,61 @@ | ||
#![crate_name = "foo"] | ||
#![feature(doc_cfg)] | ||
#![feature(staged_api)] | ||
#![stable(feature = "rust1", since = "1.0.0")] | ||
|
||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub mod tag { | ||
#[unstable(feature = "humans", issue = "none")] | ||
pub trait Unstable {} | ||
|
||
#[stable(feature = "rust1", since = "1.0.0")] | ||
#[doc(cfg(feature = "sync"))] | ||
pub trait Portability {} | ||
|
||
#[unstable(feature = "humans", issue = "none")] | ||
#[doc(cfg(feature = "sync"))] | ||
pub trait Both {} | ||
|
||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub trait None {} | ||
} | ||
|
||
// @has foo/mod1/index.html | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub mod mod1 { | ||
// @has - '//code' 'pub use tag::Unstable;' | ||
// @has - '//span' 'Experimental' | ||
// @!has - '//span' 'sync' | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub use tag::Unstable; | ||
} | ||
|
||
// @has foo/mod2/index.html | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub mod mod2 { | ||
// @has - '//code' 'pub use tag::Portability;' | ||
// @!has - '//span' 'Experimental' | ||
// @has - '//span' 'sync' | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub use tag::Portability; | ||
} | ||
|
||
// @has foo/mod3/index.html | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub mod mod3 { | ||
// @has - '//code' 'pub use tag::Both;' | ||
// @has - '//span' 'Experimental' | ||
// @has - '//span' 'sync' | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub use tag::Both; | ||
} | ||
|
||
// @has foo/mod4/index.html | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub mod mod4 { | ||
// @has - '//code' 'pub use tag::None;' | ||
// @!has - '//span' 'Experimental' | ||
// @!has - '//span' 'sync' | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub use tag::None; | ||
} |