From 9dbfca2279bb194920c6cb44e01b39ac46457954 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 9 Aug 2020 10:32:31 +0100
Subject: [PATCH] move, compiles

---
 src/bin/otter.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 041f8081..1e855377 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -118,16 +118,17 @@ fn parse_args<T,F>(apmaker: &F) -> T
 fn main() {
   use argparse::*;
 
-  let (mut mainopts, subcommand, subargs) =
-    parse_args::< (MainOpts, String, Vec<String>), _ >(&
- | (mainopts, subcommand, subargs) | {
-  let mut ap = ArgumentParser::new();
+  let (mut mainopts, subcommand, subargs) = parse_args(&|(
+    mainopts, subcommand, subargs):
+    &mut (MainOpts, String, Vec<String>)
+  |{
+    let mut ap = ArgumentParser::new();
     ap.stop_on_first_argument(true);
     ap.silence_double_dash(true);
     ap.refer(subcommand).add_argument("subcommand",Store,
-                                           "subcommand");
+                                      "subcommand");
     ap.refer(subargs).add_argument("...",Collect,
-                                        "subcommand options/argueents");
+                                   "subcommand options/argueents");
 
     let mut scope = ap.refer(&mut mainopts.scope);
     scope.add_option(&["--scope-server"],
@@ -142,8 +143,7 @@ fn main() {
                      StoreConst(None),
                      "use USER scope");
     ap
-  }
-  );
+  });
 
   mainopts.scope.get_or_insert_with(||{
     let user = env::var("USER").unwrap_or_else(|e|{
-- 
2.30.2