From e2a77b3d46e09a263fbba0ad7b964781659e6f40 Mon Sep 17 00:00:00 2001 From: Tor Hovland Date: Wed, 14 Apr 2021 21:41:46 +0200 Subject: [PATCH] Test Deprecated, Portability, and Unstable. --- ...bility-tags-deprecated-and-portability.rs} | 18 +++++- ...stability-tags-unstable-and-portability.rs | 61 +++++++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-) rename src/test/rustdoc/{issue-83832.rs => reexport-stability-tags-deprecated-and-portability.rs} (64%) create mode 100644 src/test/rustdoc/reexport-stability-tags-unstable-and-portability.rs diff --git a/src/test/rustdoc/issue-83832.rs b/src/test/rustdoc/reexport-stability-tags-deprecated-and-portability.rs similarity index 64% rename from src/test/rustdoc/issue-83832.rs rename to src/test/rustdoc/reexport-stability-tags-deprecated-and-portability.rs index a00401fbe09..a79d05904e3 100644 --- a/src/test/rustdoc/issue-83832.rs +++ b/src/test/rustdoc/reexport-stability-tags-deprecated-and-portability.rs @@ -8,7 +8,11 @@ pub mod tag { #[doc(cfg(feature = "sync"))] pub trait Portability {} - pub trait Unstable {} + #[deprecated(since = "0.1.8", note = "Use bar() instead")] + #[doc(cfg(feature = "sync"))] + pub trait Both {} + + pub trait None {} } // @has foo/mod1/index.html @@ -29,8 +33,16 @@ pub mod mod2 { // @has foo/mod3/index.html pub mod mod3 { - // @has - '//code' 'pub use tag::Unstable;' + // @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::Unstable; + pub use tag::None; } diff --git a/src/test/rustdoc/reexport-stability-tags-unstable-and-portability.rs b/src/test/rustdoc/reexport-stability-tags-unstable-and-portability.rs new file mode 100644 index 00000000000..ff8a910f59f --- /dev/null +++ b/src/test/rustdoc/reexport-stability-tags-unstable-and-portability.rs @@ -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; +}