diff options
| author | Michael Davis | 2024-01-23 14:29:07 +0000 |
|---|---|---|
| committer | Blaž Hrastnik | 2024-01-24 06:47:49 +0000 |
| commit | 6d724a8f331f4b2a8f1a001e990cf6129dc50b00 (patch) | |
| tree | cc2d8c6068ec8ad58aa29320c08c6218b2e8070d /helix-dap | |
| parent | 6bfe1ddc53f542d62e242fd4aaf6748dda1b0e71 (diff) | |
Re-export `which` from `helix-stdx::env`
We use `which::which` in many crates, so `which` was a separate
dependency across all of them. We can centralize `which` into the
stdx crate so it's easy for all crates to depend on it.
I also moved the rest of `helix-view/src/env.rs` into helix-stdx's
`env` module since it only contained a thin wrapper around `which`
and `std::env`.
Diffstat (limited to 'helix-dap')
| -rw-r--r-- | helix-dap/Cargo.toml | 2 | ||||
| -rw-r--r-- | helix-dap/src/client.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/helix-dap/Cargo.toml b/helix-dap/Cargo.toml index f7acb003..3521f589 100644 --- a/helix-dap/Cargo.toml +++ b/helix-dap/Cargo.toml @@ -13,6 +13,7 @@ homepage.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +helix-stdx = { path = "../helix-stdx" } helix-core = { path = "../helix-core" } anyhow = "1.0" @@ -21,7 +22,6 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "net", "sync"] } -which = "5.0.0" [dev-dependencies] fern = "0.6" diff --git a/helix-dap/src/client.rs b/helix-dap/src/client.rs index 55ebab57..579811df 100644 --- a/helix-dap/src/client.rs +++ b/helix-dap/src/client.rs @@ -113,7 +113,7 @@ impl Client { id: usize, ) -> Result<(Self, UnboundedReceiver<Payload>)> { // Resolve path to the binary - let cmd = which::which(cmd).map_err(|err| anyhow::anyhow!(err))?; + let cmd = helix_stdx::env::which(cmd).map_err(|err| anyhow::anyhow!(err))?; let process = Command::new(cmd) .args(args) |