fix(util): improve remove_all_files_except function (#141)

- Address inconsistent behavior of remove_all_files function by saving
partial results in a vector before removing them
- EXTRA: clippy --fix applied to project

Author: tartarughina

src/config.rs

@@ -21,7 +21,7 @@ pub fn get_java_home(configuration: &Option<Value>, worktree: &Worktree) -> Opti
         match expand_home_path(worktree, java_home.to_string()) {
             Ok(home_path) => return Some(home_path),
             Err(err) => {
-                println!("{}", err);
+                println!("{err}");
             }
         };
     }
@@ -86,7 +86,7 @@ pub fn get_jdtls_launcher(configuration: &Option<Value>, worktree: &Worktree) ->
         match expand_home_path(worktree, launcher_path.to_string()) {
             Ok(path) => return Some(path),
             Err(err) => {
-                println!("{}", err);
+                println!("{err}");
             }
         }
     }
@@ -103,7 +103,7 @@ pub fn get_lombok_jar(configuration: &Option<Value>, worktree: &Worktree) -> Opt
         match expand_home_path(worktree, jar_path.to_string()) {
             Ok(path) => return Some(path),
             Err(err) => {
-                println!("{}", err);
+                println!("{err}");
             }
         }
     }
@@ -120,7 +120,7 @@ pub fn get_java_debug_jar(configuration: &Option<Value>, worktree: &Worktree) ->
         match expand_home_path(worktree, jar_path.to_string()) {
             Ok(path) => return Some(path),
             Err(err) => {
-                println!("{}", err);
+                println!("{err}");
             }
         }
     }

src/debugger.rs

@@ -157,8 +157,7 @@ impl Debugger {
         )
         .map_err(|err| {
             format!(
-                "Failed to download java-debug fork from {}: {err}",
-                JAVA_DEBUG_PLUGIN_FORK_URL
+                "Failed to download java-debug fork from {JAVA_DEBUG_PLUGIN_FORK_URL}: {err}"
             )
         })?;
 
@@ -198,8 +197,7 @@ impl Debugger {
             }
 
             println!(
-                "Could not fetch debugger: {}\nFalling back to local version.",
-                err
+                "Could not fetch debugger: {err}\nFalling back to local version."
             );
 
             let exists = fs::read_dir(prefix)

src/jdtls.rs

@@ -283,7 +283,7 @@ fn find_equinox_launcher(jdtls_base_directory: &Path) -> Result<PathBuf, String>
 
     // else get the first file that matches the glob 'org.eclipse.equinox.launcher_*.jar'
     let entries =
-        read_dir(&plugins_dir).map_err(|e| format!("Failed to read plugins directory: {}", e))?;
+        read_dir(&plugins_dir).map_err(|e| format!("Failed to read plugins directory: {e}"))?;
 
     entries
         .filter_map(Result::ok)
@@ -325,7 +325,7 @@ fn get_jdtls_data_path(worktree: &Worktree) -> zed::Result<PathBuf> {
     let cache_key = worktree.root_path();
 
     let hex_digest = get_sha1_hex(&cache_key);
-    let unique_dir_name = format!("jdtls-{}", hex_digest);
+    let unique_dir_name = format!("jdtls-{hex_digest}");
     Ok(base_cachedir.join(unique_dir_name))
 }
 

src/lsp.rs

@@ -118,7 +118,7 @@ impl LspClient {
 fn string_to_hex(s: &str) -> String {
     let mut hex_string = String::new();
     for byte in s.as_bytes() {
-        hex_string.push_str(&format!("{:02x}", byte));
+        hex_string.push_str(&format!("{byte:02x}"));
     }
     hex_string
 }

src/util.rs

@@ -20,7 +20,8 @@ const EXPAND_ERROR: &str = "Failed to expand ~";
 const CURR_DIR_ERROR: &str = "Could not get current dir";
 const DIR_ENTRY_LOAD_ERROR: &str = "Failed to load directory entry";
 const DIR_ENTRY_RM_ERROR: &str = "Failed to remove directory entry";
-const DIR_ENTRY_LS_ERROR: &str = "Failed to list prefix directory";
+const ENTRY_TYPE_ERROR: &str = "Could not determine entry type";
+const FILE_ENTRY_RM_ERROR: &str = "Failed to remove file entry";
 const PATH_TO_STR_ERROR: &str = "Failed to convert path to string";
 const JAVA_EXEC_ERROR: &str = "Failed to convert Java executable path to string";
 const JAVA_VERSION_ERROR: &str = "Failed to determine Java major version";
@@ -49,7 +50,7 @@ pub fn create_path_if_not_exists<P: AsRef<Path>>(path: P) -> zed::Result<()> {
             if metadata.is_dir() {
                 Ok(())
             } else {
-                Err(format!("{PATH_IS_NOT_DIR}: {:?}", path_ref))
+                Err(format!("{PATH_IS_NOT_DIR}: {path_ref:?}"))
             }
         }
         Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
@@ -280,22 +281,31 @@ pub fn path_to_string<P: AsRef<Path>>(path: P) -> zed::Result<String> {
 ///
 /// Returns `Ok(())` on success, even if some removals fail (errors are printed to stdout).
 pub fn remove_all_files_except<P: AsRef<Path>>(prefix: P, filename: &str) -> zed::Result<()> {
-    match fs::read_dir(prefix) {
-        Ok(entries) => {
-            for entry in entries {
-                match entry {
-                    Ok(entry) => {
-                        if entry.file_name().to_str() != Some(filename)
-                            && let Err(err) = fs::remove_dir_all(entry.path())
-                        {
-                            println!("{msg}: {err}", msg = DIR_ENTRY_RM_ERROR, err = err);
-                        }
+    let entries: Vec<_> = match fs::read_dir(prefix) {
+        Ok(entries) => entries.filter_map(|e| e.ok()).collect(),
+        Err(err) => {
+            println!("{DIR_ENTRY_LOAD_ERROR}: {err}");
+            return Err(format!("{DIR_ENTRY_LOAD_ERROR}: {err}"));
+        }
+    };
+
+    for entry in entries {
+        if entry.file_name().to_str() != Some(filename) {
+            match entry.file_type() {
+                Ok(t) => {
+                    if t.is_dir()
+                        && let Err(err) = fs::remove_dir_all(entry.path())
+                    {
+                        println!("{DIR_ENTRY_RM_ERROR}: {err}");
+                    } else if t.is_file()
+                        && let Err(err) = fs::remove_file(entry.path())
+                    {
+                        println!("{FILE_ENTRY_RM_ERROR}: {err}");
                     }
-                    Err(err) => println!("{msg}: {err}", msg = DIR_ENTRY_LOAD_ERROR, err = err),
                 }
+                Err(type_err) => println!("{ENTRY_TYPE_ERROR}: {type_err}"),
             }
         }
-        Err(err) => println!("{msg}: {err}", msg = DIR_ENTRY_LS_ERROR, err = err),
     }
 
     Ok(())
@@ -328,8 +338,7 @@ pub fn should_use_local_or_download(
         CheckUpdates::Never => match local {
             Some(path) => Ok(Some(path)),
             None => Err(format!(
-                "{} for {}",
-                NO_LOCAL_INSTALL_NEVER_ERROR, component_name
+                "{NO_LOCAL_INSTALL_NEVER_ERROR} for {component_name}"
             )),
         },
         CheckUpdates::Once => Ok(local),