about summary refs log tree commit diff
path: root/src/libcore/future/future.rs
diff options
context:
space:
mode:
authorWesley Wiser <wwiser@gmail.com>2019-12-31 19:18:08 -0500
committerWesley Wiser <wwiser@gmail.com>2019-12-31 19:18:08 -0500
commit717702dffdf9ddb84e1fd35f189511a307e350e1 (patch)
treec34014104d73e4a6b70fec7a76b9a0e7f37b125a /src/libcore/future/future.rs
parent119307a83e12291a3fc126735d6bd0292c443464 (diff)
downloadrust-717702dffdf9ddb84e1fd35f189511a307e350e1.tar.gz
rust-717702dffdf9ddb84e1fd35f189511a307e350e1.zip
Revert "core: add IntoFuture trait and support for await"
This reverts commit f35517ee861dc012ccc26083dd4520045e2c4f6f.
Diffstat (limited to 'src/libcore/future/future.rs')
-rw-r--r--src/libcore/future/future.rs25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/libcore/future/future.rs b/src/libcore/future/future.rs
index dcb819f9381..f14ed38b9b0 100644
--- a/src/libcore/future/future.rs
+++ b/src/libcore/future/future.rs
@@ -99,21 +99,6 @@ pub trait Future {
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output>;
 }
 
-/// Conversion into a `Future`.
-#[unstable(feature = "into_future", issue = "67644")]
-pub trait IntoFuture {
-    /// The output that the future will produce on completion.
-    #[unstable(feature = "into_future", issue = "67644")]
-    type Output;
-    /// Which kind of future are we turning this into?
-    #[unstable(feature = "into_future", issue = "67644")]
-    type Future: Future<Output = Self::Output>;
-
-    /// Creates a future from a value.
-    #[unstable(feature = "into_future", issue = "67644")]
-    fn into_future(self) -> Self::Future;
-}
-
 #[stable(feature = "futures_api", since = "1.36.0")]
 impl<F: ?Sized + Future + Unpin> Future for &mut F {
     type Output = F::Output;
@@ -134,13 +119,3 @@ where
         Pin::get_mut(self).as_mut().poll(cx)
     }
 }
-
-#[unstable(feature = "into_future", issue = "67644")]
-impl<F: Future> IntoFuture for F {
-    type Output = F::Output;
-    type Future = F;
-
-    fn into_future(self) -> Self::Future {
-        self
-    }
-}