From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 9 Aug 2020 09:29:03 +0000 (+0100)
Subject: move, compiles
X-Git-Tag: otter-0.2.0~1152
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=93be111db97192c42a33db565b083974ef11636f;p=otter.git

move, compiles
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index f2fad9e8..041f8081 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -118,9 +118,9 @@ fn parse_args<T,F>(apmaker: &F) -> T
 fn main() {
   use argparse::*;
 
-  let apmaker :
-      fn(&mut (MainOpts, String, Vec<String>)) -> ArgumentParser
-         = | (mainopts, subcommand, subargs) | {
+  let (mut mainopts, subcommand, subargs) =
+    parse_args::< (MainOpts, String, Vec<String>), _ >(&
+ | (mainopts, subcommand, subargs) | {
   let mut ap = ArgumentParser::new();
     ap.stop_on_first_argument(true);
     ap.silence_double_dash(true);
@@ -142,8 +142,8 @@ fn main() {
                      StoreConst(None),
                      "use USER scope");
     ap
-  };
-  let (mut mainopts, subcommand, subargs) = parse_args(&apmaker);
+  }
+  );
 
   mainopts.scope.get_or_insert_with(||{
     let user = env::var("USER").unwrap_or_else(|e|{