From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 8 Aug 2020 17:56:05 +0000 (+0100)
Subject: shuffle nfc
X-Git-Tag: otter-0.2.0~1160
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6afaf1f48bbbdb43c31d9e5649c1522e9269f8af;p=otter.git

shuffle nfc
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 3ddcddb4..4a61b18b 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -132,7 +132,7 @@ fn main() {
                      StoreConst(None),
                      "use USER scope");
 
-    ap.parse_args()?;
+    ap.parse_args().unwrap_or_else(|rc| exit(if rc!=0 { EXIT_USAGE } else { 0 }));
     mem::drop(ap);
     mainopts.scope.get_or_insert_with(||{
       let user = env::var("USER").unwrap_or_else(|e|{
@@ -143,8 +143,8 @@ fn main() {
       });
       ManagementScope::Unix { user }
     });
-    <Result<_,i32>>::Ok((mainopts, subcommand, subargs))
-  })().unwrap_or_else(|rc| exit(if rc!=0 { EXIT_USAGE } else { 0 }));
+    (mainopts, subcommand, subargs)
+  })();
 
   for _ in inventory::iter::<Subcommand> { }