diff options
| author | Sean McArthur <sean@seanmonstar.com> | 2019-12-26 12:57:09 -0800 |
|---|---|---|
| committer | Sean McArthur <sean@seanmonstar.com> | 2019-12-27 11:56:11 -0800 |
| commit | f35517ee861dc012ccc26083dd4520045e2c4f6f (patch) | |
| tree | 7a45f4f0a3eee9c1e3173d7f85162edda8a80543 /src/libstd | |
| parent | 41501a6b03a8f10d8c29dfcb37dbd5ff84b33f34 (diff) | |
| download | rust-f35517ee861dc012ccc26083dd4520045e2c4f6f.tar.gz rust-f35517ee861dc012ccc26083dd4520045e2c4f6f.zip | |
core: add IntoFuture trait and support for await
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/future.rs | 6 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs index 9c7422c2b20..908736c6393 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -10,7 +10,11 @@ use core::task::{Context, Poll}; #[doc(inline)] #[stable(feature = "futures_api", since = "1.36.0")] -pub use core::future::*; +pub use core::future::Future; + +#[doc(inline)] +#[unstable(feature = "into_future", issue = "67644")] +pub use core::future::IntoFuture; /// Wrap a generator in a future. /// diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 9e9df5ab9b6..82c8dc1237e 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -269,6 +269,7 @@ #![feature(hashmap_internals)] #![feature(int_error_internals)] #![feature(int_error_matching)] +#![feature(into_future)] #![feature(integer_atomics)] #![feature(lang_items)] #![feature(libc)] |