use 'if-else' rather than 'match' for single matches

2 files changed, 34 insertions, 39 deletions

diff --git a/src/file/source/file.rs b/src/file/source/file.rs
index 9bd3ddd..017e0d3 100644
--- a/src/file/source/file.rs
+++ b/src/file/source/file.rs
@@ -35,29 +35,28 @@ impl FileSourceFile {
 
         // First check for an _exact_ match
         if filename.is_file() {
-            return match format_hint {
-                Some(format) => Ok((filename, Box::new(format))),
-                None => {
-                    for (format, extensions) in ALL_EXTENSIONS.iter() {
-                        if extensions.contains(
-                            &filename
-                                .extension()
-                                .unwrap_or_default()
-                                .to_string_lossy()
-                                .as_ref(),
-                        ) {
-                            return Ok((filename, Box::new(*format)));
-                        }
+            return if let Some(format) = format_hint {
+                Ok((filename, Box::new(format)))
+            } else {
+                for (format, extensions) in ALL_EXTENSIONS.iter() {
+                    if extensions.contains(
+                        &filename
+                            .extension()
+                            .unwrap_or_default()
+                            .to_string_lossy()
+                            .as_ref(),
+                    ) {
+                        return Ok((filename, Box::new(*format)));
                     }
-
-                    Err(Box::new(io::Error::new(
-                        io::ErrorKind::NotFound,
-                        format!(
-                            "configuration file \"{}\" is not of a registered file format",
-                            filename.to_string_lossy()
-                        ),
-                    )))
                 }
+
+                Err(Box::new(io::Error::new(
+                    io::ErrorKind::NotFound,
+                    format!(
+                        "configuration file \"{}\" is not of a registered file format",
+                        filename.to_string_lossy()
+                    ),
+                )))
             };
         }
 
diff --git a/src/path/mod.rs b/src/path/mod.rs
index 24a6325..d78d07d 100644
--- a/src/path/mod.rs
+++ b/src/path/mod.rs
@@ -128,13 +128,13 @@ impl Expression {
             },
 
             Expression::Child(ref expr, ref key) => match expr.get_mut_forcibly(root) {
-                Some(value) => match value.kind {
-                    ValueKind::Table(ref mut map) => Some(
-                        map.entry(key.clone())
-                            .or_insert_with(|| Value::new(None, ValueKind::Nil)),
-                    ),
-
-                    _ => {
+                Some(value) => {
+                    if let ValueKind::Table(ref mut map) = value.kind {
+                        Some(
+                            map.entry(key.clone())
+                                .or_insert_with(|| Value::new(None, ValueKind::Nil)),
+                        )
+                    } else {
                         *value = Map::<String, Value>::new().into();
 
                         if let ValueKind::Table(ref mut map) = value.kind {
@@ -146,7 +146,7 @@ impl Expression {
                             unreachable!();
                         }
                     }
-                },
+                }
 
                 _ => None,
             },
@@ -221,17 +221,13 @@ impl Expression {
 
             Expression::Child(ref expr, ref key) => {
                 if let Some(parent) = expr.get_mut_forcibly(root) {
-                    match parent.kind {
-                        ValueKind::Table(_) => {
-                            Expression::Identifier(key.clone()).set(parent, value);
-                        }
+                    if let ValueKind::Table(_) = parent.kind {
+                        Expression::Identifier(key.clone()).set(parent, value);
+                    } else {
+                        // Didn't find a table. Oh well. Make a table and do this anyway
+                        *parent = Map::<String, Value>::new().into();
 
-                        _ => {
-                            // Didn't find a table. Oh well. Make a table and do this anyway
-                            *parent = Map::<String, Value>::new().into();
-
-                            Expression::Identifier(key.clone()).set(parent, value);
-                        }
+                        Expression::Identifier(key.clone()).set(parent, value);
                     }
                 }
             }