aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_project_model')
-rw-r--r--crates/ra_project_model/Cargo.toml3
-rw-r--r--crates/ra_project_model/src/cargo_workspace.rs14
-rw-r--r--crates/ra_project_model/src/lib.rs3
-rw-r--r--crates/ra_project_model/src/sysroot.rs16
4 files changed, 19 insertions, 17 deletions
diff --git a/crates/ra_project_model/Cargo.toml b/crates/ra_project_model/Cargo.toml
index 5e651fe70..626478468 100644
--- a/crates/ra_project_model/Cargo.toml
+++ b/crates/ra_project_model/Cargo.toml
@@ -14,8 +14,9 @@ rustc-hash = "1.1.0"
14cargo_metadata = "0.9.1" 14cargo_metadata = "0.9.1"
15 15
16ra_arena = { path = "../ra_arena" } 16ra_arena = { path = "../ra_arena" }
17ra_db = { path = "../ra_db" }
18ra_cfg = { path = "../ra_cfg" } 17ra_cfg = { path = "../ra_cfg" }
18ra_db = { path = "../ra_db" }
19ra_env = { path = "../ra_env" }
19ra_proc_macro = { path = "../ra_proc_macro" } 20ra_proc_macro = { path = "../ra_proc_macro" }
20 21
21serde = { version = "1.0.106", features = ["derive"] } 22serde = { version = "1.0.106", features = ["derive"] }
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index 16fff9f1c..eb9f33ee8 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -1,7 +1,6 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3use std::{ 3use std::{
4 env,
5 ffi::OsStr, 4 ffi::OsStr,
6 ops, 5 ops,
7 path::{Path, PathBuf}, 6 path::{Path, PathBuf},
@@ -12,6 +11,7 @@ use anyhow::{Context, Result};
12use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId}; 11use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId};
13use ra_arena::{Arena, Idx}; 12use ra_arena::{Arena, Idx};
14use ra_db::Edition; 13use ra_db::Edition;
14use ra_env::get_path_for_executable;
15use rustc_hash::FxHashMap; 15use rustc_hash::FxHashMap;
16 16
17/// `CargoWorkspace` represents the logical structure of, well, a Cargo 17/// `CargoWorkspace` represents the logical structure of, well, a Cargo
@@ -146,12 +146,8 @@ impl CargoWorkspace {
146 cargo_toml: &Path, 146 cargo_toml: &Path,
147 cargo_features: &CargoConfig, 147 cargo_features: &CargoConfig,
148 ) -> Result<CargoWorkspace> { 148 ) -> Result<CargoWorkspace> {
149 let _ = Command::new(cargo_binary())
150 .arg("--version")
151 .output()
152 .context("failed to run `cargo --version`, is `cargo` in PATH?")?;
153
154 let mut meta = MetadataCommand::new(); 149 let mut meta = MetadataCommand::new();
150 meta.cargo_path(get_path_for_executable("cargo")?);
155 meta.manifest_path(cargo_toml); 151 meta.manifest_path(cargo_toml);
156 if cargo_features.all_features { 152 if cargo_features.all_features {
157 meta.features(CargoOpt::AllFeatures); 153 meta.features(CargoOpt::AllFeatures);
@@ -293,7 +289,7 @@ pub fn load_extern_resources(
293 cargo_toml: &Path, 289 cargo_toml: &Path,
294 cargo_features: &CargoConfig, 290 cargo_features: &CargoConfig,
295) -> Result<ExternResources> { 291) -> Result<ExternResources> {
296 let mut cmd = Command::new(cargo_binary()); 292 let mut cmd = Command::new(get_path_for_executable("cargo")?);
297 cmd.args(&["check", "--message-format=json", "--manifest-path"]).arg(cargo_toml); 293 cmd.args(&["check", "--message-format=json", "--manifest-path"]).arg(cargo_toml);
298 if cargo_features.all_features { 294 if cargo_features.all_features {
299 cmd.arg("--all-features"); 295 cmd.arg("--all-features");
@@ -347,7 +343,3 @@ fn is_dylib(path: &Path) -> bool {
347 Some(ext) => matches!(ext.as_str(), "dll" | "dylib" | "so"), 343 Some(ext) => matches!(ext.as_str(), "dll" | "dylib" | "so"),
348 } 344 }
349} 345}
350
351fn cargo_binary() -> String {
352 env::var("CARGO").unwrap_or_else(|_| "cargo".to_string())
353}
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index c226ffa57..88a6ffb2a 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -14,6 +14,7 @@ use std::{
14use anyhow::{bail, Context, Result}; 14use anyhow::{bail, Context, Result};
15use ra_cfg::CfgOptions; 15use ra_cfg::CfgOptions;
16use ra_db::{CrateGraph, CrateName, Edition, Env, ExternSource, ExternSourceId, FileId}; 16use ra_db::{CrateGraph, CrateName, Edition, Env, ExternSource, ExternSourceId, FileId};
17use ra_env::get_path_for_executable;
17use rustc_hash::FxHashMap; 18use rustc_hash::FxHashMap;
18use serde_json::from_reader; 19use serde_json::from_reader;
19 20
@@ -569,7 +570,7 @@ pub fn get_rustc_cfg_options(target: Option<&String>) -> CfgOptions {
569 570
570 match (|| -> Result<String> { 571 match (|| -> Result<String> {
571 // `cfg(test)` and `cfg(debug_assertion)` are handled outside, so we suppress them here. 572 // `cfg(test)` and `cfg(debug_assertion)` are handled outside, so we suppress them here.
572 let mut cmd = Command::new("rustc"); 573 let mut cmd = Command::new(get_path_for_executable("rustc")?);
573 cmd.args(&["--print", "cfg", "-O"]); 574 cmd.args(&["--print", "cfg", "-O"]);
574 if let Some(target) = target { 575 if let Some(target) = target {
575 cmd.args(&["--target", target.as_str()]); 576 cmd.args(&["--target", target.as_str()]);
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
index 55ff5ad80..11c26ad89 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/ra_project_model/src/sysroot.rs
@@ -8,6 +8,7 @@ use std::{
8}; 8};
9 9
10use ra_arena::{Arena, Idx}; 10use ra_arena::{Arena, Idx};
11use ra_env::get_path_for_executable;
11 12
12#[derive(Default, Debug, Clone)] 13#[derive(Default, Debug, Clone)]
13pub struct Sysroot { 14pub struct Sysroot {
@@ -88,9 +89,14 @@ fn create_command_text(program: &str, args: &[&str]) -> String {
88 format!("{} {}", program, args.join(" ")) 89 format!("{} {}", program, args.join(" "))
89} 90}
90 91
91fn run_command_in_cargo_dir(cargo_toml: &Path, program: &str, args: &[&str]) -> Result<Output> { 92fn run_command_in_cargo_dir(
93 cargo_toml: impl AsRef<Path>,
94 program: impl AsRef<Path>,
95 args: &[&str],
96) -> Result<Output> {
97 let program = program.as_ref().as_os_str().to_str().expect("Invalid Unicode in path");
92 let output = Command::new(program) 98 let output = Command::new(program)
93 .current_dir(cargo_toml.parent().unwrap()) 99 .current_dir(cargo_toml.as_ref().parent().unwrap())
94 .args(args) 100 .args(args)
95 .output() 101 .output()
96 .context(format!("{} failed", create_command_text(program, args)))?; 102 .context(format!("{} failed", create_command_text(program, args)))?;
@@ -114,13 +120,15 @@ fn get_or_install_rust_src(cargo_toml: &Path) -> Result<PathBuf> {
114 if let Ok(path) = env::var("RUST_SRC_PATH") { 120 if let Ok(path) = env::var("RUST_SRC_PATH") {
115 return Ok(path.into()); 121 return Ok(path.into());
116 } 122 }
117 let rustc_output = run_command_in_cargo_dir(cargo_toml, "rustc", &["--print", "sysroot"])?; 123 let rustc = get_path_for_executable("rustc")?;
124 let rustc_output = run_command_in_cargo_dir(cargo_toml, &rustc, &["--print", "sysroot"])?;
118 let stdout = String::from_utf8(rustc_output.stdout)?; 125 let stdout = String::from_utf8(rustc_output.stdout)?;
119 let sysroot_path = Path::new(stdout.trim()); 126 let sysroot_path = Path::new(stdout.trim());
120 let src_path = sysroot_path.join("lib/rustlib/src/rust/src"); 127 let src_path = sysroot_path.join("lib/rustlib/src/rust/src");
121 128
122 if !src_path.exists() { 129 if !src_path.exists() {
123 run_command_in_cargo_dir(cargo_toml, "rustup", &["component", "add", "rust-src"])?; 130 let rustup = get_path_for_executable("rustup")?;
131 run_command_in_cargo_dir(cargo_toml, &rustup, &["component", "add", "rust-src"])?;
124 } 132 }
125 if !src_path.exists() { 133 if !src_path.exists() {
126 bail!( 134 bail!(