Simplifies argument parsing Ref. #2.

leggettc18 · Oct 2, 2018 · 38da5f2 · 38da5f2
1 parent eccebce
commit 38da5f2
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -53,25 +53,15 @@ impl Config {
                 command = Some(String::from("info"));
                 fund_name = list_matches.value_of("name");
             },
-            ("", None) => command = Some(String::from("list")),
+            ("", None) => command = Some(String::from("info")),
             _ => unreachable!(),
         }
 
         let fund_name = fund_name.map_or(None, |x| Some(String::from(x)));
 
-        let amount = match amount {
-            Some(x) => {
-                Some(x.replace(".", "").parse::<i32>()?)
-            },
-            None => None,
-        };
+        let amount = amount.map_or(Ok(None), |x| x.replace(".", "").parse::<i32>().map(Some))?;
 
-        let goal = match goal {
-            Some(x) => {
-                Some(x.replace(".", "").parse::<i32>()?)
-            },
-            None => None,
-        };
+        let goal = goal.map_or(Ok(None), |x| x.replace(".", "").parse::<i32>().map(Some))?;
 
         Ok(Config { configfile, fundfile, command, fund_name, amount, goal })
     }