💥 Replace action! macro with actions!

pagetop-admin/src/lib.rs

@@ -30,7 +30,7 @@ impl ModuleTrait for Admin {
     }
 
     fn actions(&self) -> Vec<Action> {
-        vec![action!(ActionBeforePrepareBody => before_prepare_body)]
+        actions![ActionBeforePrepareBody::with(before_prepare_body)]
     }
 
     fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {

pagetop-jquery/src/lib.rs

@@ -29,7 +29,7 @@ impl ModuleTrait for JQuery {
     }
 
     fn actions(&self) -> Vec<Action> {
-        vec![action!(ActionAfterPrepareBody => after_prepare_body)]
+        actions![ActionAfterPrepareBody::with(after_prepare_body)]
     }
 
     fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {

pagetop-minimal/src/lib.rs

@@ -30,7 +30,7 @@ impl ModuleTrait for Minimal {
     }
 
     fn actions(&self) -> Vec<Action> {
-        vec![action!(ActionAfterPrepareBody => after_prepare_body, 99)]
+        actions![ActionAfterPrepareBody::with(after_prepare_body).with_weight(99)]
     }
 
     fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {

pagetop-node/src/lib.rs

@@ -27,7 +27,7 @@ impl ModuleTrait for Node {
     }
 
     fn actions(&self) -> Vec<Action> {
-        vec![action!(ActionBeforePrepareBody => before_prepare_body, -1)]
+        actions![ActionBeforePrepareBody::with(before_prepare_body).with_weight(-1)]
     }
 
     fn migrations(&self) -> Vec<MigrationItem> {

pagetop/src/core/action.rs

@@ -8,10 +8,3 @@ use list::ActionsList;
 mod all;
 pub(crate) use all::add_action;
 pub use all::run_actions;
-
-#[macro_export]
-macro_rules! action {
-    ( $action:ty => $f:ident $(, $weight:expr)? ) => {{
-        Box::new(<$action>::new().with_action($f)$(.with_weight($weight))?)
-    }};
-}

pagetop/src/core/action/list.rs

@@ -31,3 +31,17 @@ impl ActionsList {
         let _: Vec<_> = self.0.read().unwrap().iter().map(f).collect();
     }
 }
+
+#[macro_export]
+macro_rules! actions {
+    () => {
+        Vec::<Action>::new()
+    };
+    ( $($action:expr),+ $(,)? ) => {{
+        let mut v = Vec::<Action>::new();
+        $(
+            v.push(Box::new($action));
+        )*
+        v
+    }};
+}

pagetop/src/core/module/definition.rs

@@ -1,7 +1,7 @@
 use crate::core::action::Action;
 use crate::core::component::L10n;
 use crate::core::theme::ThemeRef;
-use crate::{service, util, Handle};
+use crate::{actions, service, util, Handle};
 
 #[cfg(feature = "database")]
 use crate::{db::MigrationItem, migrations};
@@ -37,7 +37,7 @@ pub trait ModuleTrait: ModuleBase + Send + Sync {
     }
 
     fn actions(&self) -> Vec<Action> {
-        vec![]
+        actions![]
     }
 
     fn init(&self) {}

pagetop/src/prelude.rs

@@ -18,8 +18,8 @@ pub use crate::default_settings;
 pub use crate::static_locales;
 // crate::service
 pub use crate::{static_files, static_files_service};
-// crate::core::action
-pub use crate::action;
+// crate::core::actions
+pub use crate::actions;
 // crate::core::component
 pub use crate::actions_for_component;