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-lsp | |
| 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-lsp')
| -rw-r--r-- | helix-lsp/Cargo.toml | 1 | ||||
| -rw-r--r-- | helix-lsp/src/client.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml index 510be6ee..8e9e3407 100644 --- a/helix-lsp/Cargo.toml +++ b/helix-lsp/Cargo.toml @@ -29,5 +29,4 @@ serde_json = "1.0" thiserror = "1.0" tokio = { version = "1.35", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] } tokio-stream = "0.1.14" -which = "5.0.0" parking_lot = "0.12.1" diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs index 7eef2bf7..f8c2912e 100644 --- a/helix-lsp/src/client.rs +++ b/helix-lsp/src/client.rs @@ -183,7 +183,7 @@ impl Client { doc_path: Option<&std::path::PathBuf>, ) -> Result<(Self, UnboundedReceiver<(usize, Call)>, Arc<Notify>)> { // 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) .envs(server_environment) |