about summary refs log tree commit diff
path: root/src/liballoc
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/liballoc
parente617025e96fa95f074291a1cc284235a80824eaf (diff)
downloadrust-3f966dcd53faabd8313d29a4e1ba2464995e624a.tar.gz
rust-3f966dcd53faabd8313d29a4e1ba2464995e624a.zip
Stabilize futures_api
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/boxed.rs2
-rw-r--r--src/liballoc/lib.rs1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index 8a3950718d7..207359ed696 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -911,7 +911,7 @@ impl<G: ?Sized + Generator> Generator for Pin<Box<G>> {
     }
 }
 
-#[unstable(feature = "futures_api", issue = "50547")]
+#[stable(feature = "futures_api", since = "1.36.0")]
 impl<F: ?Sized + Future + Unpin> Future for Box<F> {
     type Output = F::Output;
 
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 63b3fbbdaef..eb673488170 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -85,7 +85,6 @@
 #![feature(fmt_internals)]
 #![feature(fn_traits)]
 #![feature(fundamental)]
-#![feature(futures_api)]
 #![feature(lang_items)]
 #![feature(libc)]
 #![feature(needs_allocator)]