X-Git-Url: https://git.r.bdr.sh/rbdr/blog/blobdiff_plain/d7fef30ac3f539975ef9edbba8e0af4a4e9ff3de..b17907faf8d9693cef94a6048d802bd4ced9102f:/src/configuration.rs?ds=sidebyside

diff --git a/src/configuration.rs b/src/configuration.rs
index 1c0e905..dd9a6a9 100644
--- a/src/configuration.rs
+++ b/src/configuration.rs
@@ -81,13 +81,11 @@ impl Configuration {
             Ok(directory) => PathBuf::from(directory),
             Err(_) => match env::var(default_value) {
                 Ok(directory) => PathBuf::from(directory),
-                Err(_) => match env::var("HOME") {
-                    Ok(directory) => PathBuf::from(directory).join(home_fallback),
-                    Err(_) => panic!(
-                        "Could not find required directory, {} or {} should be set and readable.",
-                        user_override, default_value
-                    ),
-                },
+                Err(_) => env::var("HOME")
+                    .map_or_else(
+                        |_| panic!("Could not find required directory, {user_override} or {default_value} should be set and readable"),
+                        |directory| PathBuf::from(directory).join(home_fallback)
+                    )
             },
         }
         .join(path)