mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #79174 - taiki-e:std-future, r=Mark-Simulacrum

Browse Source 
Make std::future a re-export of core::future

After 1a764a7ef5, there are no `std::future`-specific items (except for `cfg(bootstrap)` items removed in 93eed402ad). So, instead of defining `std` own module, we can re-export the `core::future` directly.
This commit is contained in:
Jonas Schievink 2021-01-24 22:09:49 +01:00 committed by GitHub
commit 13b88c21d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/std/src/future.rs
View File

@ -1,17 +0,0 @@
//! Asynchronous values.
#[doc(inline)]
#[stable(feature = "futures_api", since = "1.36.0")]
pub use core::future::Future;
#[doc(inline)]
#[unstable(feature = "gen_future", issue = "50547")]
pub use core::future::{from_generator, get_context, ResumeTy};
#[doc(inline)]
#[stable(feature = "future_readiness_fns", since = "1.48.0")]
pub use core::future::{pending, ready, Pending, Ready};
#[doc(inline)]
#[unstable(feature = "into_future", issue = "67644")]
pub use core::future::IntoFuture;

5
library/std/src/lib.rs
View File

@ -406,6 +406,8 @@
pub use core::convert;
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::default;
#[stable(feature = "futures_api", since = "1.36.0")]
pub use core::future;
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::hash;
#[stable(feature = "core_hint", since = "1.27.0")]
@ -505,9 +507,6 @@ pub mod task {
pub use alloc::task::*;
}
#[stable(feature = "futures_api", since = "1.36.0")]
pub mod future;
// Platform-abstraction modules
#[macro_use]
mod sys_common;