aboutsummaryrefslogtreecommitdiff
path: root/helix-stdx/src
diff options
context:
space:
mode:
authorMichael Davis2024-01-23 18:36:53 +0000
committerBlaž Hrastnik2024-01-24 06:47:49 +0000
commitcb25d13028ec1cdf986a3567ea52562ea654a7b8 (patch)
treea820e7dbceebe37fbfb3897429747ba8bfeb524b /helix-stdx/src
parent6d724a8f331f4b2a8f1a001e990cf6129dc50b00 (diff)
Improve error handling for `which::which` failures
Co-authored-by: Pascal Kuthe <pascalkuthe@pm.me>
Diffstat (limited to 'helix-stdx/src')
-rw-r--r--helix-stdx/src/env.rs28
1 files changed, 25 insertions, 3 deletions
diff --git a/helix-stdx/src/env.rs b/helix-stdx/src/env.rs
index 3676727f..90a0aee8 100644
--- a/helix-stdx/src/env.rs
+++ b/helix-stdx/src/env.rs
@@ -1,6 +1,5 @@
-pub use which::which;
-
use std::{
+ ffi::OsStr,
path::{Path, PathBuf},
sync::RwLock,
};
@@ -36,10 +35,33 @@ pub fn env_var_is_set(env_var_name: &str) -> bool {
std::env::var_os(env_var_name).is_some()
}
-pub fn binary_exists(binary_name: &str) -> bool {
+pub fn binary_exists<T: AsRef<OsStr>>(binary_name: T) -> bool {
which::which(binary_name).is_ok()
}
+pub fn which<T: AsRef<OsStr>>(
+ binary_name: T,
+) -> Result<std::path::PathBuf, ExecutableNotFoundError> {
+ which::which(binary_name.as_ref()).map_err(|err| ExecutableNotFoundError {
+ command: binary_name.as_ref().to_string_lossy().into_owned(),
+ inner: err,
+ })
+}
+
+#[derive(Debug)]
+pub struct ExecutableNotFoundError {
+ command: String,
+ inner: which::Error,
+}
+
+impl std::fmt::Display for ExecutableNotFoundError {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "command '{}' not found: {}", self.command, self.inner)
+ }
+}
+
+impl std::error::Error for ExecutableNotFoundError {}
+
#[cfg(test)]
mod tests {
use super::{current_working_dir, set_current_working_dir};