Extend macro to allow members

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

1 files changed, 18 insertions, 0 deletions

diff --git a/mqtt-tester/src/executable.rs b/mqtt-tester/src/executable.rs
index f8367be..bb5caf3 100644
--- a/mqtt-tester/src/executable.rs
+++ b/mqtt-tester/src/executable.rs
@@ -54,6 +54,24 @@ pub trait ClientExecutableCommand {
 }
 
 macro_rules! define_command {
+    ($tyname:ident { $($member:ident : $memty:ty ),+ } => $s:literal, args: $($arg:literal),+) => {
+        pub struct $tyname {
+            $(pub $member : $memty),*
+        }
+
+        impl ClientExecutableCommand for $tyname {
+            fn as_str(&self) -> &'static str {
+                $s
+            }
+            fn args(&self) -> Vec<String> {
+                $(let $member = &self.$member;)+
+
+                vec![
+                    $(format!($arg)),+
+                ]
+            }
+        }
+    };
     ($tyname:ident => $s:literal, args: $($arg:literal),+) => {
         pub struct $tyname;