diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-02-14 16:23:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-14 16:23:30 +0100 |
| commit | c21a76fde055cda034f4e407febcfaf5b71f6fac (patch) | |
| tree | 5b75ad73d78869cd174055229dea92fe11752150 /library/std | |
| parent | 678ff2a59b11737126df55ac5154320166e0560b (diff) | |
| parent | 8c24c0a023456c3d9e58f06a3abf0a83d335c6f6 (diff) | |
| download | rust-c21a76fde055cda034f4e407febcfaf5b71f6fac.tar.gz rust-c21a76fde055cda034f4e407febcfaf5b71f6fac.zip | |
Rollup merge of #136886 - ehuss:remove-prelude-common, r=jhpratt
Remove the common prelude module This fixes the issues described in https://github.com/rust-lang/rust/issues/136102. Primarily, this resolves some issues with how the documentation for the prelude is generated: - It avoids showing "unstable" for macros in the prelude that are actually stable. - Avoids duplication of some pages due to the previous lack of `doc(no_inline)`. - Makes the different edition preludes consistent, and sets a pattern that can be used by future editions. We may need to rearrange these modules in the future if we decide to remove anything from the prelude again. If we do, I think we should look into a different solution that avoids the documentation problems. Closes https://github.com/rust-lang/rust/issues/136102
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/prelude/mod.rs | 14 | ||||
| -rw-r--r-- | library/std/src/prelude/v1.rs (renamed from library/std/src/prelude/common.rs) | 4 |
2 files changed, 6 insertions, 12 deletions
diff --git a/library/std/src/prelude/mod.rs b/library/std/src/prelude/mod.rs index 14e6c2715df..992a9207a72 100644 --- a/library/std/src/prelude/mod.rs +++ b/library/std/src/prelude/mod.rs @@ -111,16 +111,7 @@ #![stable(feature = "rust1", since = "1.0.0")] -mod common; - -/// The first version of the prelude of The Rust Standard Library. -/// -/// See the [module-level documentation](self) for more. -#[stable(feature = "rust1", since = "1.0.0")] -pub mod v1 { - #[stable(feature = "rust1", since = "1.0.0")] - pub use super::common::*; -} +pub mod v1; /// The 2015 version of the prelude of The Rust Standard Library. /// @@ -162,7 +153,8 @@ pub mod rust_2021 { #[stable(feature = "prelude_2024", since = "1.85.0")] pub mod rust_2024 { #[stable(feature = "rust1", since = "1.0.0")] - pub use super::common::*; + #[doc(no_inline)] + pub use super::v1::*; #[stable(feature = "prelude_2024", since = "1.85.0")] #[doc(no_inline)] diff --git a/library/std/src/prelude/common.rs b/library/std/src/prelude/v1.rs index 0f2d8334fca..5b324b2e916 100644 --- a/library/std/src/prelude/common.rs +++ b/library/std/src/prelude/v1.rs @@ -1,7 +1,9 @@ -//! Items common to the prelude of all editions. +//! The first version of the prelude of The Rust Standard Library. //! //! See the [module-level documentation](super) for more. +#![stable(feature = "rust1", since = "1.0.0")] + // No formatting: this file is nothing but re-exports, and their order is worth preserving. #![cfg_attr(rustfmt, rustfmt::skip)] |