From 3f966dcd53faabd8313d29a4e1ba2464995e624a Mon Sep 17 00:00:00 2001
From: Taylor Cramer <cramertj@google.com>
Date: Fri, 5 Apr 2019 14:14:19 -0700
Subject: Stabilize futures_api

---
 src/liballoc/boxed.rs | 2 +-
 src/liballoc/lib.rs   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/liballoc')

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)]
-- 
cgit 1.4.1-3-g733a5