tidy

Signed-off-by: tison <[email protected]>

Author: tisonkun

fastimer/src/schedule/arbitrary.rs

@@ -22,7 +22,6 @@ use crate::info;
 use crate::schedule::BaseAction;
 use crate::schedule::delay_or_shutdown;
 use crate::schedule::execute_or_shutdown;
-use crate::schedule::initial_delay_or_shutdown;
 
 /// Repeatable action that can be scheduled with arbitrary delay.
 ///
@@ -54,8 +53,12 @@ pub trait ArbitraryDelayActionExt: ArbitraryDelayAction {
             );
 
             'schedule: {
-                if initial_delay_or_shutdown(&self, &make_delay, initial_delay).await {
-                    break 'schedule;
+                if let Some(initial_delay) = initial_delay {
+                    if initial_delay > Duration::ZERO
+                        && delay_or_shutdown(&mut self, make_delay.delay(initial_delay)).await
+                    {
+                        break 'schedule;
+                    }
                 }
 
                 loop {
@@ -66,7 +69,7 @@ pub trait ArbitraryDelayActionExt: ArbitraryDelayAction {
                     }
 
                     let next = self.next_run_at();
-                    if delay_or_shutdown(&self, make_delay.delay_util(next)).await {
+                    if delay_or_shutdown(&mut self, make_delay.delay_util(next)).await {
                         break;
                     }
                 }

fastimer/src/schedule/mod.rs

@@ -15,9 +15,6 @@
 //! Repeatable and cancellable actions.
 
 use std::future::Future;
-use std::time::Duration;
-
-use crate::MakeDelay;
 
 use self::select::Either;
 use self::select::select;
@@ -51,28 +48,7 @@ pub trait BaseAction: Send + 'static {
 }
 
 /// Returns `true` if the action is shutdown.
-async fn initial_delay_or_shutdown<A, D>(
-    action: &A,
-    make_delay: &D,
-    initial_delay: Option<Duration>,
-) -> bool
-where
-    A: BaseAction,
-    D: MakeDelay,
-{
-    let Some(initial_delay) = initial_delay else {
-        return false;
-    };
-
-    if initial_delay.is_zero() {
-        return false;
-    }
-
-    delay_or_shutdown(action, make_delay.delay(initial_delay)).await
-}
-
-/// Returns `true` if the action is shutdown.
-async fn delay_or_shutdown<A, D>(action: &A, delay: D) -> bool
+async fn delay_or_shutdown<A, D>(action: &mut A, delay: D) -> bool
 where
     A: BaseAction,
     D: Future<Output = ()>,

fastimer/src/schedule/notify.rs

@@ -20,8 +20,8 @@ use crate::Spawn;
 use crate::debug;
 use crate::info;
 use crate::schedule::BaseAction;
+use crate::schedule::delay_or_shutdown;
 use crate::schedule::execute_or_shutdown;
-use crate::schedule::initial_delay_or_shutdown;
 
 /// Repeatable action that can be scheduled by notifications.
 ///
@@ -63,8 +63,12 @@ pub trait NotifyActionExt: NotifyAction {
             );
 
             'schedule: {
-                if initial_delay_or_shutdown(&mut self, make_delay, initial_delay).await {
-                    break 'schedule;
+                if let Some(initial_delay) = initial_delay {
+                    if initial_delay > Duration::ZERO
+                        && delay_or_shutdown(&mut self, make_delay.delay(initial_delay)).await
+                    {
+                        break 'schedule;
+                    }
                 }
 
                 loop {

fastimer/src/schedule/simple.rs

@@ -25,7 +25,6 @@ use crate::make_instant_from_now;
 use crate::schedule::BaseAction;
 use crate::schedule::delay_or_shutdown;
 use crate::schedule::execute_or_shutdown;
-use crate::schedule::initial_delay_or_shutdown;
 
 /// Repeatable action.
 ///
@@ -59,8 +58,12 @@ pub trait SimpleActionExt: SimpleAction {
             );
 
             'schedule: {
-                if initial_delay_or_shutdown(&mut self, &make_delay, initial_delay).await {
-                    break 'schedule;
+                if let Some(initial_delay) = initial_delay {
+                    if initial_delay > Duration::ZERO
+                        && delay_or_shutdown(&mut self, make_delay.delay(initial_delay)).await
+                    {
+                        break 'schedule;
+                    }
                 }
 
                 loop {