From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 6 Jun 2021 21:14:03 +0000 (+0100)
Subject: otter: Fold in a copy of parse_args into main
X-Git-Tag: otter-0.7.0~69
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ab5b34d6379ce4030e0af1bf877da3cedc5379fa;p=otter.git

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 aaaae3cc..a0c7cf7e 100644
--- 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;