about summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorTaylor Cramer <cramertj@google.com>2019-04-05 14:14:19 -0700
committerTaylor Cramer <cramertj@google.com>2019-04-23 16:13:53 -0700
commit3f966dcd53faabd8313d29a4e1ba2464995e624a (patch)
treec3f73c87a32335ab5b88aa889bc977598d90eb1f /src/libstd/lib.rs
parente617025e96fa95f074291a1cc284235a80824eaf (diff)
downloadrust-3f966dcd53faabd8313d29a4e1ba2464995e624a.tar.gz
rust-3f966dcd53faabd8313d29a4e1ba2464995e624a.zip
Stabilize futures_api
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs10
1 files changed, 3 insertions, 7 deletions
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