Remove pointless closure in mullvad_paths

4 files changed, 7 insertions, 15 deletions

diff --git a/mullvad-paths/src/cache.rs b/mullvad-paths/src/cache.rs
index dfd7a46cae..9e96a89a91 100644
--- a/mullvad-paths/src/cache.rs
+++ b/mullvad-paths/src/cache.rs
@@ -10,7 +10,7 @@ pub fn cache_dir() -> Result<PathBuf> {
     let permissions = Some(std::os::unix::fs::PermissionsExt::from_mode(0o755));
     #[cfg(target_os = "windows")]
     let permissions = true;
-    crate::create_and_return(get_cache_dir, permissions)
+    crate::create_and_return(get_cache_dir()?, permissions)
 }
 
 pub fn get_cache_dir() -> Result<PathBuf> {
diff --git a/mullvad-paths/src/lib.rs b/mullvad-paths/src/lib.rs
index 05641360c0..4c16b7a437 100644
--- a/mullvad-paths/src/lib.rs
+++ b/mullvad-paths/src/lib.rs
@@ -48,11 +48,7 @@ fn get_allusersprofile_dir() -> Result<PathBuf> {
 }
 
 #[cfg(any(target_os = "linux", target_os = "macos"))]
-fn create_and_return(
-    dir_fn: fn() -> Result<PathBuf>,
-    permissions: Option<fs::Permissions>,
-) -> Result<PathBuf> {
-    let dir = dir_fn()?;
+fn create_and_return(dir: PathBuf, permissions: Option<fs::Permissions>) -> Result<PathBuf> {
     fs::create_dir_all(&dir).map_err(|e| Error::CreateDirFailed(dir.display().to_string(), e))?;
     if let Some(permissions) = permissions {
         fs::set_permissions(&dir, permissions)
@@ -62,11 +58,7 @@ fn create_and_return(
 }
 
 #[cfg(windows)]
-fn create_and_return(
-    dir_fn: fn() -> Result<PathBuf>,
-    set_security_permissions: bool,
-) -> Result<PathBuf> {
-    let dir = dir_fn()?;
+fn create_and_return(dir: PathBuf, set_security_permissions: bool) -> Result<PathBuf> {
     create_dir_recursive(&dir, set_security_permissions)?;
     Ok(dir)
 }
diff --git a/mullvad-paths/src/logs.rs b/mullvad-paths/src/logs.rs
index 53f7763589..fcc4926c75 100644
--- a/mullvad-paths/src/logs.rs
+++ b/mullvad-paths/src/logs.rs
@@ -8,11 +8,11 @@ pub fn log_dir() -> Result<PathBuf> {
     {
         use std::os::unix::fs::PermissionsExt;
         let permissions = Some(PermissionsExt::from_mode(0o755));
-        crate::create_and_return(get_log_dir, permissions)
+        crate::create_and_return(get_log_dir()?, permissions)
     }
     #[cfg(target_os = "windows")]
     {
-        crate::create_and_return(get_log_dir, true)
+        crate::create_and_return(get_log_dir()?, true)
     }
 }
 
diff --git a/mullvad-paths/src/settings.rs b/mullvad-paths/src/settings.rs
index d6ebabe6e7..97171dbb21 100644
--- a/mullvad-paths/src/settings.rs
+++ b/mullvad-paths/src/settings.rs
@@ -6,12 +6,12 @@ use std::{env, path::PathBuf};
 pub fn settings_dir() -> Result<PathBuf> {
     #[cfg(not(target_os = "windows"))]
     {
-        crate::create_and_return(get_settings_dir, None)
+        crate::create_and_return(get_settings_dir()?, None)
     }
 
     #[cfg(target_os = "windows")]
     {
-        crate::create_and_return(get_settings_dir, false)
+        crate::create_and_return(get_settings_dir()?, false)
     }
 }