diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-24 05:16:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-24 05:16:18 +0200 |
| commit | 48cb6bead104df5158e1e571d0de04b59610e7e6 (patch) | |
| tree | 07b71ec48f84c17e385af632f57174ab0dee5117 /src/libstd | |
| parent | 5f82b5b8828202d53be0d0e11504094bbcf28806 (diff) | |
| parent | 3f966dcd53faabd8313d29a4e1ba2464995e624a (diff) | |
| download | rust-48cb6bead104df5158e1e571d0de04b59610e7e6.tar.gz rust-48cb6bead104df5158e1e571d0de04b59610e7e6.zip | |
Rollup merge of #59739 - cramertj:stabilize, r=withoutboats
Stabilize futures_api cc https://github.com/rust-lang/rust/issues/59725. Based on https://github.com/rust-lang/rust/pull/59733 and https://github.com/rust-lang/rust/pull/59119 -- only the last two commits here are relevant. r? @withoutboats , @oli-obk for the introduction of `rustc_allow_const_fn_ptr`.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/future.rs | 1 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 10 | ||||
| -rw-r--r-- | src/libstd/panic.rs | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs index 898387cb9f5..c18a314116b 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -9,6 +9,7 @@ use core::task::{Context, Poll}; use core::ops::{Drop, Generator, GeneratorState}; #[doc(inline)] +#[stable(feature = "futures_api", since = "1.36.0")] pub use core::future::*; /// Wrap a generator in a future. diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 62bc1991cc9..bdec0c347f5 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -263,7 +263,6 @@ #![feature(fixed_size_array)] #![feature(fn_traits)] #![feature(fnbox)] -#![feature(futures_api)] #![feature(generator_trait)] #![feature(hash_raw_entry)] #![feature(hashmap_internals)] @@ -458,18 +457,15 @@ pub mod process; pub mod sync; pub mod time; -#[unstable(feature = "futures_api", - reason = "futures in libcore are unstable", - issue = "50547")] +#[stable(feature = "futures_api", since = "1.36.0")] pub mod task { //! Types and Traits for working with asynchronous tasks. #[doc(inline)] + #[stable(feature = "futures_api", since = "1.36.0")] pub use core::task::*; } -#[unstable(feature = "futures_api", - reason = "futures in libcore are unstable", - issue = "50547")] +#[stable(feature = "futures_api", since = "1.36.0")] pub mod future; // Platform-abstraction modules diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 5a8101e2301..7a3b5d30500 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -319,7 +319,7 @@ impl<T: fmt::Debug> fmt::Debug for AssertUnwindSafe<T> { } } -#[unstable(feature = "futures_api", issue = "50547")] +#[stable(feature = "futures_api", since = "1.36.0")] impl<F: Future> Future for AssertUnwindSafe<F> { type Output = F::Output; |