Remove AnyAction

Author: tizoc

src/dispatcher.rs

@@ -1,26 +1,29 @@
-use crate::EnablingCondition;
-use std::collections::VecDeque;
+use std::{collections::VecDeque, marker::PhantomData};
 
 pub struct Dispatcher<Action, State> {
-    queue: VecDeque<AnyAction<Action, State>>,
+    queue: VecDeque<Action>,
+    _marker: PhantomData<State>,
 }
 
-impl<Action, State> Dispatcher<Action, State> {
+impl<Action, State> Dispatcher<Action, State>
+where
+    Action: crate::EnablingCondition<State>,
+{
     pub fn new() -> Self {
         Self {
             queue: VecDeque::new(),
+            _marker: Default::default(),
         }
     }
 
     pub fn push<T>(&mut self, action: T)
     where
-        T: 'static + EnablingCondition<State> + Into<Action> + Clone + Send,
+        T: Into<Action>,
     {
-        let wrapped_action = AnyAction::<Action, State>::new(action);
-        self.queue.push_back(wrapped_action);
+        self.queue.push_back(action.into());
     }
 
-    pub(crate) fn pop(&mut self) -> Option<AnyAction<Action, State>> {
+    pub(crate) fn pop(&mut self) -> Option<Action> {
         self.queue.pop_front()
     }
 
@@ -32,39 +35,3 @@ impl<Action, State> Dispatcher<Action, State> {
             .for_each(|action| self.queue.push_front(action));
     }
 }
-
-trait ActionConvertible<A, S>: EnablingCondition<S> {
-    fn convert(&self) -> A;
-}
-
-pub(crate) struct AnyAction<A, S> {
-    inner: Box<dyn ActionConvertible<A, S> + Send>,
-}
-
-impl<A, S> AnyAction<A, S> {
-    fn new<T>(action: T) -> Self
-    where
-        T: 'static + ActionConvertible<A, S> + Send,
-    {
-        Self {
-            inner: Box::new(action),
-        }
-    }
-
-    pub fn is_enabled(&self, state: &S, time: crate::Timestamp) -> bool {
-        self.inner.is_enabled(state, time)
-    }
-
-    pub fn convert(&self) -> A {
-        self.inner.convert()
-    }
-}
-
-impl<T, A, S> ActionConvertible<A, S> for T
-where
-    T: Clone + Into<A> + EnablingCondition<S>,
-{
-    fn convert(&self) -> A {
-        self.clone().into()
-    }
-}

src/store.rs

@@ -83,6 +83,7 @@ pub struct Store<State, Service, Action> {
 impl<State, Service, Action> Store<State, Service, Action>
 where
     Service: TimeService,
+    Action: EnablingCondition<State>,
 {
     /// Creates a new store.
     pub fn new(
@@ -218,7 +219,7 @@ where
         // Then dispatch all actions enqueued by the reducer
         while let Some(action) = self.dispatch_queue.pop() {
             if action.is_enabled(self.state(), self.last_action_id.into()) {
-                self.dispatch_enabled(action.convert());
+                self.dispatch_enabled(action);
             }
         }
     }
@@ -228,7 +229,7 @@ impl<State, Service, Action> Clone for Store<State, Service, Action>
 where
     State: Clone,
     Service: Clone,
-    Action: Clone,
+    Action: Clone + EnablingCondition<State>,
 {
     fn clone(&self) -> Self {
         Self {