Remove 'when' from Delay, switch reset to take a Duration

Author: expenses

src/delay.rs

@@ -25,7 +25,6 @@ use crate::{ScheduledTimer, TimerHandle};
 /// at.
 pub struct Delay {
     state: Option<Arc<Node<ScheduledTimer>>>,
-    when: Instant,
 }
 
 impl Delay {
@@ -38,12 +37,6 @@ impl Delay {
         Delay::new_handle(Instant::now() + dur, Default::default())
     }
 
-    /// Return the `Instant` when this delay will fire.
-    #[inline]
-    pub fn when(&self) -> Instant {
-        self.when
-    }
-
     /// Creates a new future which will fire at the time specified by `at`.
     ///
     /// The returned instance of `Delay` will be bound to the timer specified by
@@ -54,7 +47,6 @@ impl Delay {
             None => {
                 return Delay {
                     state: None,
-                    when: at,
                 }
             }
         };
@@ -72,28 +64,25 @@ impl Delay {
         if inner.list.push(&state).is_err() {
             return Delay {
                 state: None,
-                when: at,
             };
         }
 
         inner.waker.wake();
         Delay {
             state: Some(state),
-            when: at,
         }
     }
 
     /// Resets this timeout to an new timeout which will fire at the time
     /// specified by `at`.
     #[inline]
-    pub fn reset(&mut self, at: Instant) {
-        self.when = at;
-        if self._reset(self.when).is_err() {
+    pub fn reset(&mut self, delay: Duration) {
+        if self._reset(delay).is_err() {
             self.state = None
         }
     }
 
-    fn _reset(&mut self, at: Instant) -> Result<(), ()> {
+    fn _reset(&mut self, delay: Duration) -> Result<(), ()> {
         let state = match self.state {
             Some(ref state) => state,
             None => return Err(()),
@@ -111,7 +100,7 @@ impl Delay {
                     Err(s) => bits = s,
                 }
             }
-            *state.at.lock().unwrap() = Some(at);
+            *state.at.lock().unwrap() = Some(Instant::now() + delay);
             // If we fail to push our node then we've become an inert timer, so
             // we'll want to clear our `state` field accordingly
             timeouts.list.push(state)?;
@@ -165,6 +154,6 @@ impl Drop for Delay {
 
 impl fmt::Debug for Delay {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        f.debug_struct("Delay").field("when", &self.when).finish()
+        f.debug_struct("Delay").finish()
     }
 }

src/delay_wasm.rs

@@ -2,7 +2,7 @@
 
 use gloo_timers::future::TimeoutFuture;
 use send_wrapper::SendWrapper;
-use std::{time::{Duration, Instant}, pin::Pin, task::{Context, Poll}, future::Future};
+use std::{time::Duration, pin::Pin, task::{Context, Poll}, future::Future};
 
 /// A version of `Delay` that works on wasm.
 #[derive(Debug)]
@@ -19,8 +19,8 @@ impl Delay {
 
 	/// Resets the timeout. Panics on wasm.
 	#[inline]
-	pub fn reset(&mut self, at: Instant) {
-		panic!("Resetting the timeout is not supported on wasm.")
+	pub fn reset(&mut self, at: Duration) {
+		*self = Delay::new(at);
 	}
 }
 

tests/smoke.rs

@@ -24,7 +24,7 @@ async fn reset() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     assert!(i.elapsed() > dur);
 
     let i = Instant::now();
-    d.reset(Instant::now() + dur);
+    d.reset(dur);
     d.await;
     assert!(i.elapsed() > dur);
     Ok(())