update to released crate

Author: dsherret

Cargo.lock

@@ -26,8 +26,7 @@ thiserror = "2.0.9"
 tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "process", "rt-multi-thread", "sync", "time"], optional = true }
 deno_path_util = "0.4.0"
 sys_traits = { version = "0.1.14", optional = true, features = ["real", "winapi", "libc"] }
-# temporarily using until https://github.com/harryfei/which-rs/pull/109 is released
-which = { package = "temp_deno_which", version = "0.1.0", default-features = false }
+which = { version = "8.0.0", default-features = false }
 
 [target.'cfg(unix)'.dependencies]
 nix = { version = "0.29.0", features = ["signal"], optional = true }

Cargo.toml

@@ -84,28 +84,35 @@ impl which::sys::Sys for ShellState {
     std::env::split_paths(paths).collect()
   }
 
-  fn env_var_os(&self, name: &OsStr) -> Option<OsString> {
-    self.get_var(name).cloned()
+  fn env_path(&self) -> Option<OsString> {
+    self.get_var(OsStr::new("PATH")).cloned()
+  }
+
+  fn env_path_ext(&self) -> Option<OsString> {
+    self.get_var(OsStr::new("PATHEXT")).cloned()
   }
 
   fn env_windows_path_ext(&self) -> Cow<'static, [String]> {
     Cow::Owned(
       self
-        .env_var(OsStr::new("PATHEXT"))
-        .map(|pathext| {
-          pathext
-            .split(';')
-            .filter_map(|s| {
-              if s.as_bytes().first() == Some(&b'.') {
-                Some(s.to_owned())
-              } else {
-                // Invalid segment; just ignore it.
-                None
-              }
-            })
-            .collect::<Vec<_>>()
+        .env_path_ext()
+        .and_then(|pathext| {
+          Some(
+            pathext
+              .to_str()?
+              .split(';')
+              .filter_map(|s| {
+                if s.as_bytes().first() == Some(&b'.') {
+                  Some(s.to_owned())
+                } else {
+                  // Invalid segment; just ignore it.
+                  None
+                }
+              })
+              .collect::<Vec<_>>(),
+          )
         })
-        .unwrap_or_else(|_| {
+        .unwrap_or_else(|| {
           vec![
             ".EXE".to_string(),
             ".CMD".to_string(),