Skip to content

Commit 2586853

Browse files
authored
Rollup merge of rust-lang#121041 - Nilstrieb:into-the-future-of-2024, r=Mark-Simulacrum
Add `Future` and `IntoFuture` to the 2024 prelude Implements rust-lang/rfcs#3509.
2 parents f310700 + 8d958dd commit 2586853

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

core/src/prelude/mod.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,13 @@ pub mod rust_2021 {
4949
/// The 2024 edition of the core prelude.
5050
///
5151
/// See the [module-level documentation](self) for more.
52-
#[unstable(feature = "prelude_2024", issue = "none")]
52+
#[unstable(feature = "prelude_2024", issue = "121042")]
5353
pub mod rust_2024 {
54-
#[unstable(feature = "prelude_2024", issue = "none")]
54+
#[unstable(feature = "prelude_2024", issue = "121042")]
5555
#[doc(no_inline)]
5656
pub use super::rust_2021::*;
57+
58+
#[unstable(feature = "prelude_2024", issue = "121042")]
59+
#[doc(no_inline)]
60+
pub use crate::future::{Future, IntoFuture};
5761
}

std/src/prelude/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ pub mod rust_2021 {
132132
/// The 2024 version of the prelude of The Rust Standard Library.
133133
///
134134
/// See the [module-level documentation](self) for more.
135-
#[unstable(feature = "prelude_2024", issue = "none")]
135+
#[unstable(feature = "prelude_2024", issue = "121042")]
136136
pub mod rust_2024 {
137-
#[unstable(feature = "prelude_2024", issue = "none")]
137+
#[unstable(feature = "prelude_2024", issue = "121042")]
138138
#[doc(no_inline)]
139139
pub use super::v1::*;
140140

141-
#[unstable(feature = "prelude_2024", issue = "none")]
141+
#[unstable(feature = "prelude_2024", issue = "121042")]
142142
#[doc(no_inline)]
143143
pub use core::prelude::rust_2024::*;
144144
}

0 commit comments

Comments
 (0)