mirror/async-std
2
0
Fork 1
mirror of https://github.com/async-rs/async-std.git synced 2025-04-03 23:16:40 +00:00
Code Issues Releases Wiki Activity

Stabilize Future adapters and IntoFuture

Browse source
This commit is contained in:
Yoshua Wuyts 2020-09-23 13:59:39 +02:00
parent e8126633a8
commit f867373e90
3 changed files with 23 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/future/future/mod.rs
View file

@ -1,24 +1,22 @@
cfg_unstable! { mod delay;
mod delay; mod flatten;
mod flatten; mod race;
mod race; mod try_race;
mod try_race; mod join;
mod join; mod try_join;
mod try_join;
use std::time::Duration; use std::time::Duration;
use delay::DelayFuture; use delay::DelayFuture;
use flatten::FlattenFuture; use flatten::FlattenFuture;
use crate::future::IntoFuture; use race::Race;
use race::Race; use try_race::TryRace;
use try_race::TryRace; use join::Join;
use join::Join; use try_join::TryJoin;
use try_join::TryJoin;
}
cfg_unstable_default! { #[cfg(feature = "default")]
use crate::future::timeout::TimeoutFuture; use crate::future::timeout::TimeoutFuture;
}
use crate::future::IntoFuture;
extension_trait! { extension_trait! {
use core::pin::Pin; use core::pin::Pin;
@ -151,8 +149,6 @@ extension_trait! {
/// dbg!(a.await); /// dbg!(a.await);
/// # }) /// # })
/// ``` /// ```
#[cfg(feature = "unstable")]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
fn delay(self, dur: Duration) -> impl Future<Output = Self::Output> [DelayFuture<Self>] fn delay(self, dur: Duration) -> impl Future<Output = Self::Output> [DelayFuture<Self>]
where where
Self: Sized, Self: Sized,
@ -174,8 +170,6 @@ extension_trait! {
/// assert_eq!(future.await, 1); /// assert_eq!(future.await, 1);
/// # }) /// # })
/// ``` /// ```
#[cfg(feature = "unstable")]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
fn flatten( fn flatten(
self, self,
) -> impl Future<Output = <Self::Output as IntoFuture>::Output> ) -> impl Future<Output = <Self::Output as IntoFuture>::Output>
@ -216,8 +210,6 @@ extension_trait! {
# }); # });
``` ```
"#] "#]
#[cfg(feature = "unstable")]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
fn race<F>( fn race<F>(
self, self,
other: F, other: F,
@ -262,8 +254,6 @@ extension_trait! {
# Ok(()) }) } # Ok(()) }) }
``` ```
"#] "#]
#[cfg(feature = "unstable")]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
fn try_race<F, T, E>( fn try_race<F, T, E>(
self, self,
other: F other: F
@ -299,8 +289,6 @@ extension_trait! {
# }); # });
``` ```
"#] "#]
#[cfg(any(feature = "unstable", feature = "docs"))]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
fn join<F>( fn join<F>(
self, self,
other: F other: F
@ -346,8 +334,6 @@ extension_trait! {
# Ok(()) }) } # Ok(()) }) }
``` ```
"#] "#]
#[cfg(any(feature = "unstable", feature = "docs"))]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
fn try_join<F, A, B, E>( fn try_join<F, A, B, E>(
self, self,
other: F other: F
@ -385,8 +371,7 @@ extension_trait! {
# }); # });
``` ```
"#] "#]
#[cfg(any(all(feature = "default", feature = "unstable"), feature = "docs"))] #[cfg(feature = "default")]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
fn timeout(self, dur: Duration) -> impl Future<Output = Self::Output> [TimeoutFuture<Self>] fn timeout(self, dur: Duration) -> impl Future<Output = Self::Output> [TimeoutFuture<Self>]
where Self: Sized where Self: Sized
{ {

2
src/future/into_future.rs
View file

@ -30,8 +30,6 @@ use std::future::Future;
/// } /// }
/// } /// }
/// ``` /// ```
#[cfg(feature = "unstable")]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
pub trait IntoFuture { pub trait IntoFuture {
/// The type of value produced on completion. /// The type of value produced on completion.
type Output; type Output;

11
src/future/mod.rs
View file

@ -47,8 +47,11 @@
//! [`Future::try_race`]: trait.Future.html#method.try_race //! [`Future::try_race`]: trait.Future.html#method.try_race
cfg_alloc! { cfg_alloc! {
pub use into_future::IntoFuture;
pub use future::Future; pub use future::Future;
pub(crate) mod future; pub(crate) mod future;
mod into_future;
} }
cfg_std! { cfg_std! {
@ -66,9 +69,5 @@ pub use timeout::{timeout, TimeoutError};
#[cfg(any(feature = "unstable", feature = "default"))] #[cfg(any(feature = "unstable", feature = "default"))]
mod timeout; mod timeout;
cfg_unstable! { pub(crate) use maybe_done::MaybeDone;
pub use into_future::IntoFuture; mod maybe_done;
pub(crate) use maybe_done::MaybeDone;
mod into_future;
mod maybe_done;
}