Fix clippy::manual_unwrap_or

Author: fox0

misc/test.rs

@@ -182,16 +182,9 @@ fn parse_binary_op(s: &str) -> Option<BinOp> {
     }
 }
 
-fn parse_int(s: &str) -> i64 {
-    match s.parse::<i64>() {
-        Ok(i) => i,
-        Err(_) => 0,
-    }
-}
-
 fn eval_binary_int(op: &BinOp, s1: &str, s2: &str) -> bool {
-    let i1 = parse_int(s1);
-    let i2 = parse_int(s2);
+    let i1: i64 = s1.parse().unwrap_or(0);
+    let i2: i64 = s2.parse().unwrap_or(0);
 
     match op {
         BinOp::IntEq => i1 == i2,

text/pr_util/args.rs

@@ -355,14 +355,10 @@ impl Parameters {
 
         let (first_page, last_page) = args.pages.unwrap_or((1, None));
 
-        let num_columns = {
-            if args.merge {
-                args.file.len()
-            } else if let Some(n) = args.columns {
-                n
-            } else {
-                1
-            }
+        let num_columns = if args.merge {
+            args.file.len()
+        } else {
+            args.columns.unwrap_or(1)
         };
 
         let form_feed = args.form_feed || args.form_feed_with_pause;