aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model/src/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_project_model/src/lib.rs')
-rw-r--r--crates/ra_project_model/src/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 5028b6b6d..e4b86f1e2 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -1,7 +1,6 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3mod cargo_workspace; 3mod cargo_workspace;
4mod find_executables;
5mod json_project; 4mod json_project;
6mod sysroot; 5mod sysroot;
7 6
@@ -15,6 +14,7 @@ use std::{
15use anyhow::{bail, Context, Result}; 14use anyhow::{bail, Context, Result};
16use ra_cfg::CfgOptions; 15use ra_cfg::CfgOptions;
17use 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;
18use rustc_hash::FxHashMap; 18use rustc_hash::FxHashMap;
19use serde_json::from_reader; 19use serde_json::from_reader;
20 20
@@ -559,7 +559,7 @@ pub fn get_rustc_cfg_options(target: Option<&String>) -> CfgOptions {
559 559
560 match (|| -> Result<String> { 560 match (|| -> Result<String> {
561 // `cfg(test)` and `cfg(debug_assertion)` are handled outside, so we suppress them here. 561 // `cfg(test)` and `cfg(debug_assertion)` are handled outside, so we suppress them here.
562 let mut cmd = Command::new("rustc"); 562 let mut cmd = Command::new(get_path_for_executable("rustc")?);
563 cmd.args(&["--print", "cfg", "-O"]); 563 cmd.args(&["--print", "cfg", "-O"]);
564 if let Some(target) = target { 564 if let Some(target) = target {
565 cmd.args(&["--target", target.as_str()]); 565 cmd.args(&["--target", target.as_str()]);