From 2ef9c9a28e705894a69097b6e7d9e8aa34007d1a Mon Sep 17 00:00:00 2001
From: Roy Ivy III <rivy.dev@gmail.com>
Date: Sun, 29 Dec 2019 00:23:03 -0600
Subject: [PATCH] refactor/polish ~ fix `cargo clippy` complaints
 (unnecessary_unwrap)

---
 src/mkdir/mkdir.rs | 19 +++++++++----------
 src/seq/seq.rs     |  8 ++++----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/mkdir/mkdir.rs b/src/mkdir/mkdir.rs
index b64998e6c..2f37b2400 100644
--- a/src/mkdir/mkdir.rs
+++ b/src/mkdir/mkdir.rs
@@ -55,16 +55,15 @@ pub fn uumain(args: Vec<String>) -> i32 {
     // Translate a ~str in octal form to u16, default to 755
     // Not tested on Windows
     let mode_match = matches.opts_str(&["mode".to_owned()]);
-    let mode: u16 = if mode_match.is_some() {
-        let m = mode_match.unwrap();
-        let res: Option<u16> = u16::from_str_radix(&m, 8).ok();
-        if res.is_some() {
-            res.unwrap()
-        } else {
-            crash!(1, "no mode given");
-        }
-    } else {
-        0o755 as u16
+    let mode: u16 = match mode_match {
+        Some(m) => {
+            let res: Option<u16> = u16::from_str_radix(&m, 8).ok();
+            match res {
+                Some(r) => r,
+                _ => crash!(1, "no mode given")
+            }
+        },
+        _ => 0o755 as u16
     };
 
     let dirs = matches.free;
diff --git a/src/seq/seq.rs b/src/seq/seq.rs
index 52a171a6e..c5b6694cf 100644
--- a/src/seq/seq.rs
+++ b/src/seq/seq.rs
@@ -95,10 +95,10 @@ fn parse_options(args: Vec<String>, options: &mut SeqOptions) -> Result<Vec<Stri
                                 Some(sep) => {
                                     options.separator = sep;
                                     let next = chiter.next();
-                                    if next.is_some() {
+                                    if let Some(n) = next {
                                         show_error!(
                                             "unexpected character ('{}')",
-                                            next.unwrap()
+                                            n
                                         );
                                         return Err(1);
                                     }
@@ -112,10 +112,10 @@ fn parse_options(args: Vec<String>, options: &mut SeqOptions) -> Result<Vec<Stri
                                 Some(term) => {
                                     options.terminator = Some(term);
                                     let next = chiter.next();
-                                    if next.is_some() {
+                                    if let Some(n) = next {
                                         show_error!(
                                             "unexpected character ('{}')",
-                                            next.unwrap()
+                                            n
                                         );
                                         return Err(1);
                                     }