From 717702dffdf9ddb84e1fd35f189511a307e350e1 Mon Sep 17 00:00:00 2001 From: Wesley Wiser Date: Tue, 31 Dec 2019 19:18:08 -0500 Subject: Revert "core: add IntoFuture trait and support for await" This reverts commit f35517ee861dc012ccc26083dd4520045e2c4f6f. --- src/libstd/future.rs | 6 +----- src/libstd/lib.rs | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/future.rs b/src/libstd/future.rs index 908736c6393..9c7422c2b20 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -10,11 +10,7 @@ use core::task::{Context, Poll}; #[doc(inline)] #[stable(feature = "futures_api", since = "1.36.0")] -pub use core::future::Future; - -#[doc(inline)] -#[unstable(feature = "into_future", issue = "67644")] -pub use core::future::IntoFuture; +pub use core::future::*; /// Wrap a generator in a future. /// diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 930bf397bc4..4b15c9ba4f3 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -269,7 +269,6 @@ #![feature(hashmap_internals)] #![feature(int_error_internals)] #![feature(int_error_matching)] -#![feature(into_future)] #![feature(integer_atomics)] #![feature(lang_items)] #![feature(libc)] -- cgit 1.4.1-3-g733a5