Move clear-game out of otter.rs

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

diff --git a/cli/forgame.rs b/cli/forgame.rs
index 21dc8eb52455a1004830bad1dafffc872e4ae6bb..e5116eed1b30f365884a4d1294d4b40405777687 100644 (file)
--- a/cli/forgame.rs
+++ b/cli/forgame.rs
@@ -377,6 +377,34 @@ mod leave_game {
   }
 }
 
+//---------- clear game ----------
+
+#[throws(AE)]
+fn clear_game(ma: &MainOpts, chan: &mut MgmtChannelForGame) {
+  chan.alter_game(vec![MGI::ClearGame{ }], None)
+    .context("clear table")?;
+  chan.cmd(&MC::ClearBundles { game: ma.instance() })
+    .context("clear bundles")?;
+}
+
+mod clear_game {
+  use super::*;
+
+  type Args = NoArgs;
+
+  #[throws(AE)]
+  fn call(SCCA{ ma, args,.. }:SCCA) {
+    let _args = parse_args::<Args,_>(args, &noargs, &ok_id, None);
+    let mut chan = ma.access_game()?;
+    clear_game(&ma, &mut chan)?;
+  }
+
+  inventory_subcmd!{
+    "clear-game",
+    "clear the table and clear out all bundles",
+  }
+}
+
 //---------- delete-game ----------
 
 mod delete_game {

diff --git a/cli/otter.rs b/cli/otter.rs
index 07189fd3598e744ceb9108d0fce1d7762661d13a..417265723487830a7c0b9e6711d332186384b6d1 100644 (file)
--- a/cli/otter.rs
+++ b/cli/otter.rs
@@ -323,34 +323,6 @@ fn main() {
     .unwrap_or_else(|e| e.end_process(12));
 }
 
-//---------- clear game ----------
-
-#[throws(AE)]
-fn clear_game(ma: &MainOpts, chan: &mut MgmtChannelForGame) {
-  chan.alter_game(vec![MGI::ClearGame{ }], None)
-    .context("clear table")?;
-  chan.cmd(&MC::ClearBundles { game: ma.instance() })
-    .context("clear bundles")?;
-}
-
-mod clear_game {
-  use super::*;
-
-  type Args = NoArgs;
-
-  #[throws(AE)]
-  fn call(SCCA{ ma, args,.. }:SCCA) {
-    let _args = parse_args::<Args,_>(args, &noargs, &ok_id, None);
-    let mut chan = ma.access_game()?;
-    clear_game(&ma, &mut chan)?;
-  }
-
-  inventory_subcmd!{
-    "clear-game",
-    "clear the table and clear out all bundles",
-  }
-}
-
 //---------- list-accounts ----------
 
 mod list_accounts {