diff options
author | Craig Disselkoen <[email protected]> | 2020-05-05 21:44:43 +0100 |
---|---|---|
committer | Craig Disselkoen <[email protected]> | 2020-05-06 00:12:56 +0100 |
commit | 5aa1bba107ef434e61c3136120b9478a307d67a9 (patch) | |
tree | 92fee5065cbd19409ab49f0e853f826e870ffbe8 /crates/ra_project_model/src/cargo_workspace.rs | |
parent | ffaef1b7aeb61984992e231d9af20f39486403ea (diff) |
more generic, find rustc as well
Diffstat (limited to 'crates/ra_project_model/src/cargo_workspace.rs')
-rw-r--r-- | crates/ra_project_model/src/cargo_workspace.rs | 57 |
1 files changed, 4 insertions, 53 deletions
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs index a15a8c68e..c7350d1e0 100644 --- a/crates/ra_project_model/src/cargo_workspace.rs +++ b/crates/ra_project_model/src/cargo_workspace.rs | |||
@@ -1,14 +1,14 @@ | |||
1 | //! FIXME: write short doc here | 1 | //! FIXME: write short doc here |
2 | 2 | ||
3 | use std::{ | 3 | use std::{ |
4 | env, | ||
5 | ffi::OsStr, | 4 | ffi::OsStr, |
6 | ops, | 5 | ops, |
7 | path::{Path, PathBuf}, | 6 | path::{Path, PathBuf}, |
8 | process::Command, | 7 | process::Command, |
9 | }; | 8 | }; |
10 | 9 | ||
11 | use anyhow::{Context, Error, Result}; | 10 | use super::find_executables::get_path_for_executable; |
11 | use anyhow::{Context, Result}; | ||
12 | use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId}; | 12 | use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId}; |
13 | use ra_arena::{Arena, Idx}; | 13 | use ra_arena::{Arena, Idx}; |
14 | use ra_db::Edition; | 14 | use ra_db::Edition; |
@@ -146,7 +146,7 @@ impl CargoWorkspace { | |||
146 | cargo_features: &CargoConfig, | 146 | cargo_features: &CargoConfig, |
147 | ) -> Result<CargoWorkspace> { | 147 | ) -> Result<CargoWorkspace> { |
148 | let mut meta = MetadataCommand::new(); | 148 | let mut meta = MetadataCommand::new(); |
149 | meta.cargo_path(cargo_binary()?); | 149 | meta.cargo_path(get_path_for_executable("cargo")?); |
150 | meta.manifest_path(cargo_toml); | 150 | meta.manifest_path(cargo_toml); |
151 | if cargo_features.all_features { | 151 | if cargo_features.all_features { |
152 | meta.features(CargoOpt::AllFeatures); | 152 | meta.features(CargoOpt::AllFeatures); |
@@ -284,7 +284,7 @@ pub fn load_extern_resources( | |||
284 | cargo_toml: &Path, | 284 | cargo_toml: &Path, |
285 | cargo_features: &CargoConfig, | 285 | cargo_features: &CargoConfig, |
286 | ) -> Result<ExternResources> { | 286 | ) -> Result<ExternResources> { |
287 | let mut cmd = Command::new(cargo_binary()?); | 287 | let mut cmd = Command::new(get_path_for_executable("cargo")?); |
288 | cmd.args(&["check", "--message-format=json", "--manifest-path"]).arg(cargo_toml); | 288 | cmd.args(&["check", "--message-format=json", "--manifest-path"]).arg(cargo_toml); |
289 | if cargo_features.all_features { | 289 | if cargo_features.all_features { |
290 | cmd.arg("--all-features"); | 290 | cmd.arg("--all-features"); |
@@ -332,52 +332,3 @@ fn is_dylib(path: &Path) -> bool { | |||
332 | Some(ext) => matches!(ext.as_str(), "dll" | "dylib" | "so"), | 332 | Some(ext) => matches!(ext.as_str(), "dll" | "dylib" | "so"), |
333 | } | 333 | } |
334 | } | 334 | } |
335 | |||
336 | /// Return a `String` to use for executable `cargo`. | ||
337 | /// | ||
338 | /// E.g., this may just be `cargo` if that gives a valid Cargo executable; or it | ||
339 | /// may be a full path to a valid Cargo. | ||
340 | fn cargo_binary() -> Result<String> { | ||
341 | // The current implementation checks three places for a `cargo` to use: | ||
342 | // 1) $CARGO environment variable (erroring if this is set but not a usable Cargo) | ||
343 | // 2) `cargo` | ||
344 | // 3) `~/.cargo/bin/cargo` | ||
345 | if let Ok(path) = env::var("CARGO") { | ||
346 | if is_valid_cargo(&path) { | ||
347 | Ok(path) | ||
348 | } else { | ||
349 | Err(Error::msg("`CARGO` environment variable points to something that's not a valid Cargo executable")) | ||
350 | } | ||
351 | } else { | ||
352 | let final_path: Option<String> = if is_valid_cargo("cargo") { | ||
353 | Some("cargo".to_owned()) | ||
354 | } else { | ||
355 | if let Some(mut path) = dirs::home_dir() { | ||
356 | path.push(".cargo"); | ||
357 | path.push("bin"); | ||
358 | path.push("cargo"); | ||
359 | if is_valid_cargo(&path) { | ||
360 | Some(path.into_os_string().into_string().expect("Invalid Unicode in path")) | ||
361 | } else { | ||
362 | None | ||
363 | } | ||
364 | } else { | ||
365 | None | ||
366 | } | ||
367 | }; | ||
368 | final_path.ok_or( | ||
369 | // This error message may also be caused by $PATH or $CARGO not being set correctly for VSCode, | ||
370 | // even if they are set correctly in a terminal. | ||
371 | // On macOS in particular, launching VSCode from terminal with `code <dirname>` causes VSCode | ||
372 | // to inherit environment variables including $PATH and $CARGO from that terminal; but | ||
373 | // launching VSCode from Dock does not inherit environment variables from a terminal. | ||
374 | // For more discussion, see #3118. | ||
375 | Error::msg("Failed to find `cargo` executable. Make sure `cargo` is in `$PATH`, or set `$CARGO` to point to a valid Cargo executable.") | ||
376 | ) | ||
377 | } | ||
378 | } | ||
379 | |||
380 | /// Does the given `Path` point to a usable `Cargo`? | ||
381 | fn is_valid_cargo(p: impl AsRef<Path>) -> bool { | ||
382 | Command::new(p.as_ref()).arg("--version").output().is_ok() | ||
383 | } | ||