1
Fork 0

Auto merge of #85687 - m-ou-se:new-prelude, r=yaahc

New prelude

RFC: rust-lang/rfcs#3114
Tracking issue: https://github.com/rust-lang/rust/issues/85684
This commit is contained in:
bors 2021-06-02 02:36:44 +00:00
commit c4f186f0ea
3 changed files with 27 additions and 14 deletions

View file

@ -88,9 +88,9 @@ pub mod v1;
/// The 2015 version of the prelude of The Rust Standard Library.
///
/// See the [module-level documentation](self) for more.
#[unstable(feature = "prelude_2015", issue = "none")]
#[unstable(feature = "prelude_2015", issue = "85684")]
pub mod rust_2015 {
#[unstable(feature = "prelude_2015", issue = "none")]
#[unstable(feature = "prelude_2015", issue = "85684")]
#[doc(no_inline)]
pub use super::v1::*;
}
@ -98,9 +98,9 @@ pub mod rust_2015 {
/// The 2018 version of the prelude of The Rust Standard Library.
///
/// See the [module-level documentation](self) for more.
#[unstable(feature = "prelude_2018", issue = "none")]
#[unstable(feature = "prelude_2018", issue = "85684")]
pub mod rust_2018 {
#[unstable(feature = "prelude_2018", issue = "none")]
#[unstable(feature = "prelude_2018", issue = "85684")]
#[doc(no_inline)]
pub use super::v1::*;
}
@ -108,13 +108,13 @@ pub mod rust_2018 {
/// The 2021 version of the prelude of The Rust Standard Library.
///
/// See the [module-level documentation](self) for more.
#[unstable(feature = "prelude_2021", issue = "none")]
#[unstable(feature = "prelude_2021", issue = "85684")]
pub mod rust_2021 {
#[unstable(feature = "prelude_2021", issue = "none")]
#[unstable(feature = "prelude_2021", issue = "85684")]
#[doc(no_inline)]
pub use super::v1::*;
#[unstable(feature = "prelude_2021", issue = "none")]
#[unstable(feature = "prelude_2021", issue = "85684")]
#[doc(no_inline)]
pub use core::prelude::rust_2021::*;
}