diff options
| author | Wesley Wiser <wwiser@gmail.com> | 2019-12-31 19:18:08 -0500 |
|---|---|---|
| committer | Wesley Wiser <wwiser@gmail.com> | 2019-12-31 19:18:08 -0500 |
| commit | 717702dffdf9ddb84e1fd35f189511a307e350e1 (patch) | |
| tree | c34014104d73e4a6b70fec7a76b9a0e7f37b125a /src/libstd | |
| parent | 119307a83e12291a3fc126735d6bd0292c443464 (diff) | |
| download | rust-717702dffdf9ddb84e1fd35f189511a307e350e1.tar.gz rust-717702dffdf9ddb84e1fd35f189511a307e350e1.zip | |
Revert "core: add IntoFuture trait and support for await"
This reverts commit f35517ee861dc012ccc26083dd4520045e2c4f6f.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/future.rs | 6 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 1 |
2 files changed, 1 insertions, 6 deletions
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)] |