Changed to unwrap methods, added integration tests

1 files changed, 5 insertions, 11 deletions

diff --git a/src/config.rs b/src/config.rs
index 8701e068..340e532a 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -9,17 +9,11 @@ use dirs::PROJECT_DIRS;
 use util::transpose;
 
 pub fn config_file() -> PathBuf {
-    match env::var("BAT_CONFIG_PATH") {
-        Ok(env_path) => {
-            let env_path_buf = PathBuf::from(env_path);
-            if env_path_buf.is_file() {
-                return env_path_buf;
-            } else {
-                return PROJECT_DIRS.config_dir().join("config");
-            }
-        }
-        Err(_) => PROJECT_DIRS.config_dir().join("config"),
-    }
+    env::var("BAT_CONFIG_PATH")
+        .ok()
+        .map(PathBuf::from)
+        .filter(|config_path| config_path.is_file())
+        .unwrap_or(PROJECT_DIRS.config_dir().join("config"))
 }
 
 pub fn get_args_from_config_file() -> Result<Vec<OsString>, shell_words::ParseError> {