Replace unwrap() by match

1 files changed, 9 insertions, 8 deletions

diff --git a/libimagtimeui/src/time.rs b/libimagtimeui/src/time.rs
index 7c494bf8..dc5cbc1a 100644
--- a/libimagtimeui/src/time.rs
+++ b/libimagtimeui/src/time.rs
@@ -53,16 +53,17 @@ impl Parse for Time {
 
         R.captures(s)
             .and_then(|capts| {
-                let hour   = capts.name("h").and_then(|o| FromStr::from_str(o).ok());
                 let minute = capts.name("m").and_then(|o| FromStr::from_str(o).ok()).unwrap_or(0);
                 let second = capts.name("s").and_then(|o| FromStr::from_str(o).ok()).unwrap_or(0);
-
-                if hour.is_none() {
-                    debug!("No hour");
-                    return None;
-                }
-
-                Some(Time::new(hour.unwrap(), minute, second))
+                let hour   = match capts.name("h").and_then(|o| FromStr::from_str(o).ok()) {
+                    None => {
+                        debug!("No hour");
+                        return None;
+                    },
+                    Some(x) => x,
+                };
+
+                Some(Time::new(hour, minute, second))
             })
     }