otter cli: Make ordinary_subcommand handle SubcommandProperties

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index d791060ddad7d611f7c09930fccfd33b13ddab21..e106610a38d67b96bbc23587db0ee303c0e5a6f6 100644 (file)
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -779,7 +779,15 @@ macro_rules! ordinary_subcmd {
       call,
       props: default(),
     }}
-  }
+  };
+  {$verb:expr, $help:expr, $($prop:tt)+} => {
+    inventory::submit!{Subcommand {
+      verb: $verb,
+      help: $help,
+      call,
+      props: SubcommandProperties { $($prop)* ..default() },
+    }}
+  };
 }
 
 //---------- list-games ----------