chore: fix formatting, clippy warnings and ensure tests pass

Author: Fahl-Design

src/commands/install.rs

@@ -73,8 +73,7 @@ pub async fn execute_install(version: &str) -> Result<()> {
                 let v = crate::fs::resolve_local_version(&resolved_version)?;
                 let bin_dir = crate::fs::get_version_bin_dir(&v)?;
                 let s = crate::shell::detect_shell();
-                let export_str1 =
-                    s.set_env_var(MULTISHELL_PATH_VAR, &bin_dir.to_string_lossy());
+                let export_str1 = s.set_env_var(MULTISHELL_PATH_VAR, &bin_dir.to_string_lossy());
                 let export_str2 = s.path(&bin_dir);
 
                 let env_file = crate::fs::get_env_update_path(None)?;
@@ -88,7 +87,7 @@ pub async fn execute_install(version: &str) -> Result<()> {
                 let mut writer = std::io::BufWriter::new(&file);
                 writeln!(writer, "{}\n{}", export_str1, export_str2)?;
                 writer.flush()?;
-                file.unlock()?;
+                fs4::fs_std::FileExt::unlock(&file)?;
 
                 unsafe {
                     std::env::set_var(MULTISHELL_PATH_VAR, &bin_dir);

src/commands/use_cmd.rs

@@ -127,7 +127,7 @@ impl Use {
         writeln!(writer, "{}", export_str1)?;
         writeln!(writer, "{}", export_str2)?;
         writer.flush()?;
-        file.unlock()?;
+        fs4::fs_std::FileExt::unlock(&file)?;
 
         // Also update the current Rust binary's environment so spawned subs (or interactive loop) see it
         unsafe {

src/network.rs

@@ -40,18 +40,19 @@ pub async fn get_available_versions() -> Result<Vec<String>> {
     // 1. Try to load from valid cache
     if cache_path.exists() {
         if let Ok(file) = File::open(&cache_path) {
-            file.lock_shared().ok();
+            fs4::fs_std::FileExt::lock_shared(&file).ok();
             let mut contents = String::new();
             let mut f = &file;
             let read_res = f.read_to_string(&mut contents);
-            file.unlock().ok();
+            fs4::fs_std::FileExt::unlock(&file).ok();
 
             if read_res.is_ok() {
                 if let Ok(metadata) = std::fs::metadata(&cache_path) {
                     if let Ok(modified) = metadata.modified() {
                         if let Ok(elapsed) = modified.elapsed() {
                             if elapsed < CACHE_DURATION {
-                                if let Ok(versions) = serde_json::from_str::<Vec<String>>(&contents) {
+                                if let Ok(versions) = serde_json::from_str::<Vec<String>>(&contents)
+                                {
                                     return Ok(versions);
                                 }
                             }
@@ -95,10 +96,7 @@ pub async fn get_available_versions() -> Result<Vec<String>> {
 
     let mut versions = Vec::new();
     for file in res {
-        if !file.is_dir
-            && file.name.starts_with("php-")
-            && file.name.ends_with(&suffix)
-        {
+        if !file.is_dir && file.name.starts_with("php-") && file.name.ends_with(&suffix) {
             if let Some(version) = file
                 .name
                 .strip_prefix("php-")
@@ -116,6 +114,7 @@ pub async fn get_available_versions() -> Result<Vec<String>> {
         std::fs::create_dir_all(&pvm_dir).ok();
         if let Ok(file) = std::fs::OpenOptions::new()
             .create(true)
+            .truncate(false)
             .read(true)
             .write(true)
             .open(&cache_path)
@@ -125,7 +124,7 @@ pub async fn get_available_versions() -> Result<Vec<String>> {
             let mut writer = std::io::BufWriter::new(&file);
             writer.write_all(json.as_bytes()).ok();
             writer.flush().ok();
-            file.unlock().ok();
+            fs4::fs_std::FileExt::unlock(&file).ok();
         }
     }
 

src/update.rs

@@ -17,6 +17,7 @@ pub async fn check_for_updates(target_version: &str) -> Result<Option<String>> {
     // Acquire lock and check if 24 hours have passed
     let mut file = std::fs::OpenOptions::new()
         .create(true)
+        .truncate(false)
         .read(true)
         .write(true)
         .open(&guard_file)?;
@@ -30,7 +31,7 @@ pub async fn check_for_updates(target_version: &str) -> Result<Option<String>> {
     if !contents.is_empty() {
         if let Ok(last_check) = contents.trim().parse::<u64>() {
             if now - last_check < 86400 {
-                file.unlock().ok();
+                fs4::fs_std::FileExt::unlock(&file).ok();
                 return Ok(None);
             }
         }
@@ -42,7 +43,7 @@ pub async fn check_for_updates(target_version: &str) -> Result<Option<String>> {
     let mut writer = std::io::BufWriter::new(&file);
     writeln!(writer, "{}", now).ok();
     writer.flush().ok();
-    file.unlock().ok();
+    fs4::fs_std::FileExt::unlock(&file).ok();
 
     if target_version == "system" {
         return Ok(None);