diff options
| author | bors <bors@rust-lang.org> | 2020-05-23 07:18:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-23 07:18:17 +0000 |
| commit | 75b0a68f35a06fc7aed8aa95831df8eace4afffb (patch) | |
| tree | ac84646e72ebb56c8a979e4f7c4b9a0b1ea08bb1 /src/libstd | |
| parent | 7f940ef5d91b53e889f111f27e00849f2f5ae4a2 (diff) | |
| parent | bf1b998be6be2b3b8dee46acd5a3e6261457bdc2 (diff) | |
| download | rust-75b0a68f35a06fc7aed8aa95831df8eace4afffb.tar.gz rust-75b0a68f35a06fc7aed8aa95831df8eace4afffb.zip | |
Auto merge of #72478 - Dylan-DPC:rollup-vval8du, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #71289 (Allow using `Self::` in doc) - #72375 (Improve E0599 explanation) - #72385 (Add some teams to prioritization exclude_labels) - #72395 (Allow rust-highfive to label issues it creates.) - #72453 (Add flag to open docs: x.py doc --open) - #72459 (Add core::future::IntoFuture) - #72461 (Clean up E0600 explanation) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/future.rs | 14 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 3 |
2 files changed, 16 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; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index ac07af5e278..cc3e613fa3d 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -266,12 +266,15 @@ #![feature(external_doc)] #![feature(fn_traits)] #![feature(format_args_nl)] +#![feature(future_readiness_fns)] +#![feature(gen_future)] #![feature(generator_trait)] #![feature(global_asm)] #![feature(hash_raw_entry)] #![feature(hashmap_internals)] #![feature(int_error_internals)] #![feature(int_error_matching)] +#![feature(into_future)] #![feature(integer_atomics)] #![feature(lang_items)] #![feature(libc)] |