Skip to content

Add future::delay #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 29, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/future/future.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ cfg_if::cfg_if! {
}
}

cfg_if::cfg_if! {
if #[cfg(any(feature = "unstable", feature = "docs"))] {
mod delay;

use std::time::Duration;
use delay::DelayFuture;
}
}

extension_trait! {
#[doc = r#"
A future represents an asynchronous computation.
Expand Down Expand Up @@ -105,6 +114,28 @@ extension_trait! {
}

pub trait FutureExt: std::future::Future {
/// Creates a future that is delayed before it starts yielding items.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the implementation, I'm not sure if this documentation is correct.

To my reading, it delays execution of the future for the time time given. It will never be polled before the delay resolves. (which might or might not be what you want)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed. I'm not fluent in English, so it might still be wrong ...

///
/// # Examples
///
/// ```
/// # async_std::task::block_on(async {
/// use async_std::future;
/// use std::time::Duration;
/// use async_std::future::FutureExt;
///
/// let a = future::ready(1).delay(Duration::from_millis(2000));
/// dbg!(a.await);
/// # })
/// ```
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
#[cfg(any(feature = "unstable", feature = "docs"))]
fn delay(self, dur: Duration) -> DelayFuture<Self>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should obfuscate the type here, as we're awaiting async fn in traits to be released. Look at the ret! macro in the stream module

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like this? 53fa132

I don't know why I'm doing this, can you give me an explanation?

Copy link
Collaborator

@skade skade Oct 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If a concrete type is returned from a trait, people might start relying on it, making this a compatibility hazard towards a future impl Future... version (which is effectively coming with proper async traits).

where
Self: Future + Sized
{
DelayFuture::new(self, dur)
}
}

impl<F: Future + Unpin + ?Sized> Future for Box<F> {
Expand Down
39 changes: 39 additions & 0 deletions src/future/future/delay.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
use std::pin::Pin;
use std::time::Duration;

use futures_timer::Delay;

use crate::future::Future;
use crate::task::{Context, Poll};

#[doc(hidden)]
#[derive(Debug)]
pub struct DelayFuture<F> {
future: F,
delay: Delay,
}

impl<F> DelayFuture<F> {
pin_utils::unsafe_pinned!(future: F);
pin_utils::unsafe_pinned!(delay: Delay);

pub fn new(future: F, dur: Duration) -> DelayFuture<F> {
let delay = Delay::new(dur);

DelayFuture { future, delay }
}
}

impl<F: Future> Future for DelayFuture<F> {
type Output = F::Output;

fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
match self.as_mut().delay().poll(cx) {
Poll::Pending => Poll::Pending,
Poll::Ready(_) => match self.future().poll(cx) {
Poll::Ready(v) => Poll::Ready(v),
Poll::Pending => Poll::Pending,
},
}
}
}
1 change: 1 addition & 0 deletions src/future/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ pub use async_macros::{select, try_select};
use cfg_if::cfg_if;

pub use future::Future;
pub use future::FutureExt;
pub use pending::pending;
pub use poll_fn::poll_fn;
pub use ready::ready;
Expand Down