otter: Fold in a copy of parse_args into main

This will Do Stuff with prefs.

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

diff --git a/cli/otter.rs b/cli/otter.rs
index aaaae3cca180dcd296c6a2476e0b52f59264710d..a0c7cf7e8f805fc1e678b99ba21d5016f271777a 100644 (file)
--- a/cli/otter.rs
+++ b/cli/otter.rs
@@ -318,12 +318,13 @@ fn main() {
     Ok(())
   };
 
-  let (subcommand, subargs, mo) = parse_args::<RawMainArgs,_>(
-    env::args().collect(),
-    &apmaker,
-    &ap_completer,
-    Some(&extra_help),
-  );
+  let mut parsed: RawMainArgs = default();
+  let args: Vec<String> = env::args().collect();
+
+  let us = run_argparse(&mut parsed, apmaker, args.clone(), Some(extra_help));
+
+  let completed = run_ap_completer(parsed, us, apmaker, &ap_completer);
+  let (subcommand, subargs, mo) = completed;
 
   let stdout = CookedStdout::new();
   let mut subargs = subargs;