about summary refs log tree commit diff
path: root/src/libstd/future.rs
diff options
context:
space:
mode:
authorYoshua Wuyts <yoshuawuyts@gmail.com>2020-05-22 10:07:46 +0200
committerYoshua Wuyts <yoshuawuyts@gmail.com>2020-05-22 10:55:01 +0200
commit9ff502029d379bebc50cf92a97f019fefba09d79 (patch)
tree52ee5155f7e2c6d9d2a6f4499f07bd5c6be09e03 /src/libstd/future.rs
parent458a3e76294fd859fb037f425404180c91e14767 (diff)
downloadrust-9ff502029d379bebc50cf92a97f019fefba09d79.tar.gz
rust-9ff502029d379bebc50cf92a97f019fefba09d79.zip
Add core::future::IntoFuture
This patch adds `core::future::IntoFuture`. However unlike earlier PRs this patch does not integrate it into the `async/.await` lowering. That integration should be done in a follow-up PR.
Diffstat (limited to 'src/libstd/future.rs')
-rw-r--r--src/libstd/future.rs14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index e2092cfefa3..89dd9fb9b2c 100644
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -2,4 +2,16 @@
 
 #[doc(inline)]
 #[stable(feature = "futures_api", since = "1.36.0")]
-pub use core::future::*;
+pub use core::future::Future;
+
+#[doc(inline)]
+#[unstable(feature = "gen_future", issue = "50547")]
+pub use core::future::{from_generator, get_context, ResumeTy};
+
+#[doc(inline)]
+#[unstable(feature = "future_readiness_fns", issue = "70921")]
+pub use core::future::{pending, ready, Pending, Ready};
+
+#[doc(inline)]
+#[unstable(feature = "into_future", issue = "67644")]
+pub use core::future::IntoFuture;