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

This commit is contained in:
Taiki Endo 2020-11-19 03:39:16 +09:00
parent 7d747db0d5
commit 517d462e40
2 changed files with 2 additions and 20 deletions

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;

View File

@ -407,6 +407,8 @@ pub use core::cmp;
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")]
@ -494,9 +496,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;