Group commands by group

Each command will have their own group when the macro is generating
code.

src/dispatcher.rs

@@ -22,114 +22,122 @@ fn do_command(_conn: &Connection, _args: &[Bytes]) -> Result<Value, Error> {
 }
 
 dispatcher! {
-    command  {
-        do_command,
-        ["random" "loading" "stale"],
-        1,
-    },
-    client {
-        cmd::client::client,
-        ["random" "loading" "stale"],
-        -2,
-    },
-    decr {
-        cmd::string::decr,
-        ["write" "denyoom" "fast"],
-        2,
-    },
-    echo {
-        cmd::client::echo,
-        ["random" "loading" "stale"],
-        2,
-    },
-    expire {
-        cmd::key::expire,
-        ["read" "write" "fast"],
-        3,
-    },
-    expireat {
-        cmd::key::expire_at,
-        ["read" "write" "fast"],
-        3,
-    },
-    expiretime {
-        cmd::key::expire_time,
-        ["read" "write" "fast"],
-        2,
-    },
-    del {
-        cmd::key::del,
-        ["random" "loading" "stale"],
-        -2,
-    },
-    get {
-        cmd::string::get,
-        ["random" "loading" "stale"],
-        2,
-    },
-    getdel {
-        cmd::string::getdel,
-        ["random" "loading" "stale"],
-        2,
-    },
-    getset {
-        cmd::string::getset,
-        ["random" "loading" "stale"],
-        -3,
-    },
-    incr {
-        cmd::string::incr,
-        ["write" "denyoom" "fast"],
-        2,
-    },
-    incrby {
-        cmd::string::incr_by,
-        ["write" "denyoom" "fast"],
-        3,
-    },
-    persist {
-        cmd::key::persist,
-        ["write" "fast"],
-        2,
-    },
-    ttl {
-        cmd::key::ttl,
-        ["read" "read"],
-        2,
-    },
-    pexpire {
-        cmd::key::expire,
-        ["read" "write" "fast"],
-        3,
-    },
-    pexpireat {
-        cmd::key::expire_at,
-        ["read" "write" "fast"],
-        3,
-    },
-    pexpiretime {
-        cmd::key::expire_time,
-        ["read" "write" "fast"],
-        2,
-    },
-    pttl {
-        cmd::key::ttl,
-        ["read" "read"],
-        2,
-    },
-    set {
-        cmd::string::set,
-        ["random" "loading" "stale"],
-        -3,
-    },
-    ping {
-        cmd::client::ping,
-        ["random" "loading" "stale"],
-        -1,
-    },
-    time {
-        do_time,
-        ["random" "loading" "stale"],
-        1,
-    },
+    keys {
+        del {
+            cmd::key::del,
+            ["random" "loading" "stale"],
+            -2,
+        },
+        expire {
+            cmd::key::expire,
+            ["read" "write" "fast"],
+            3,
+        },
+        expireat {
+            cmd::key::expire_at,
+            ["read" "write" "fast"],
+            3,
+        },
+        expiretime {
+            cmd::key::expire_time,
+            ["read" "write" "fast"],
+            2,
+        },
+        persist {
+            cmd::key::persist,
+            ["write" "fast"],
+            2,
+        },
+        pexpire {
+            cmd::key::expire,
+            ["read" "write" "fast"],
+            3,
+        },
+        pexpireat {
+            cmd::key::expire_at,
+            ["read" "write" "fast"],
+            3,
+        },
+        pexpiretime {
+            cmd::key::expire_time,
+            ["read" "write" "fast"],
+            2,
+        },
+        pttl {
+            cmd::key::ttl,
+            ["read" "read"],
+            2,
+        },
+        ttl {
+            cmd::key::ttl,
+            ["read" "read"],
+            2,
+        },
+    },
+    string {
+        decr {
+            cmd::string::decr,
+            ["write" "denyoom" "fast"],
+            2,
+        },
+        get {
+            cmd::string::get,
+            ["random" "loading" "stale"],
+            2,
+        },
+        getdel {
+            cmd::string::getdel,
+            ["random" "loading" "stale"],
+            2,
+        },
+        getset {
+            cmd::string::getset,
+            ["random" "loading" "stale"],
+            -3,
+        },
+        incr {
+            cmd::string::incr,
+            ["write" "denyoom" "fast"],
+            2,
+        },
+        incrby {
+            cmd::string::incr_by,
+            ["write" "denyoom" "fast"],
+            3,
+        },
+        set {
+            cmd::string::set,
+            ["random" "loading" "stale"],
+            -3,
+        },
+    },
+    connection {
+        client {
+            cmd::client::client,
+            ["random" "loading" "stale"],
+            -2,
+        },
+        echo {
+            cmd::client::echo,
+            ["random" "loading" "stale"],
+            2,
+        },
+        ping {
+            cmd::client::ping,
+            ["random" "loading" "stale"],
+            -1,
+        },
+    },
+    server {
+        command  {
+            do_command,
+            ["random" "loading" "stale"],
+            1,
+        },
+        time {
+            do_time,
+            ["random" "loading" "stale"],
+            1,
+        },
+    }
 }

src/macros.rs

@@ -1,13 +1,15 @@
 #[macro_export]
 macro_rules! dispatcher {
     {
-        $($command:ident {
-            $handler:expr,
-            [$($tag:tt)+],
-            $min_args:expr,
-        },)+$(,)?
+        $($ns:ident {
+            $($command:ident {
+                $handler:expr,
+                [$($tag:tt)+],
+                $min_args:expr,
+            }),+$(,)?
+        }),+$(,)?
     }=>  {
-        $(
+        $($(
             #[allow(non_snake_case, non_camel_case_types)]
             pub mod $command {
                 use super::*;
@@ -40,12 +42,16 @@ macro_rules! dispatcher {
                         }
                     }
 
+                    fn group(&self) -> &'static str {
+                        stringify!($ns)
+                    }
+
                     fn name(&self) -> &'static str {
                         stringify!($command)
                     }
                 }
             }
-        )+
+        )+)+
         use std::ops::Deref;
 
         pub trait ExecutableCommand {
@@ -53,14 +59,16 @@ macro_rules! dispatcher {
 
             fn check_number_args(&self, n: usize) -> bool;
 
+            fn group(&self) -> &'static str;
+
             fn name(&self) -> &'static str;
         }
 
         #[allow(non_snake_case, non_camel_case_types)]
         pub enum Dispatcher {
-            $(
+            $($(
                 $command($command::Command),
-            )+
+            )+)+
         }
 
         impl Dispatcher {
@@ -68,9 +76,9 @@ macro_rules! dispatcher {
                 let command = unsafe { std::str::from_utf8_unchecked(&args[0]) };
 
                 let command = match command.to_lowercase().as_str() {
-                $(
+                $($(
                     stringify!($command) => Ok(Self::$command($command::Command::new())),
-                )+
+                )+)+
                     _ => Err(Error::CommandNotFound(command.into())),
                 }?;
 
@@ -87,9 +95,9 @@ macro_rules! dispatcher {
 
             fn deref(&self) -> &(dyn ExecutableCommand + Sync + Send + 'static) {
                 match self {
-                    $(
+                    $($(
                         Self::$command(v) => v as &(dyn ExecutableCommand + Sync + Send),
-                    )+
+                    )+)+
                 }
             }
         }