refactor the main() function

cat-in-136 · Mar 6, 2021 · 98c41a0 · 98c41a0
1 parent 8682daf
commit 98c41a0
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -56,7 +56,7 @@ fn process(
     Ok(())
 }
 
-fn main() {
+fn parse_arg() -> Result<(Option<String>, Option<PathBuf>, Option<String>, AutoReqMode), Error> {
     let program = env::args().nth(0).unwrap();
 
     let mut opts = Options::new();
@@ -91,13 +91,19 @@ fn main() {
         opt_matches
             .opt_str("auto-req")
             .unwrap_or("auto".to_string()),
-    )
-    .unwrap_or_else(|err| {
-        eprintln!("{}: {}", program, err);
-        std::process::exit(1);
-    });
+    )?;
 
-    process(target_arch, target_file, package, auto_req_mode).unwrap_or_else(|err| {
+    Ok((target_arch, target_file, package, auto_req_mode))
+}
+
+fn main() {
+    (|| -> Result<(), Error> {
+        let (target_arch, target_file, package, auto_req_mode) = parse_arg()?;
+        process(target_arch, target_file, package, auto_req_mode)?;
+        Ok(())
+    })()
+    .unwrap_or_else(|err| {
+        let program = env::args().nth(0).unwrap();
         eprintln!("{}: {}", program, err);
         if cfg!(debug_assertions) {
             panic!("{:?}", err);