diff options
author | Craig Disselkoen <[email protected]> | 2020-05-05 22:07:10 +0100 |
---|---|---|
committer | Craig Disselkoen <[email protected]> | 2020-05-06 00:12:56 +0100 |
commit | 303b444dbb66019fc916dd350e54f7675aa3007f (patch) | |
tree | 163086a232e07ed91452122da5346383adaca58f /crates/ra_project_model/src/lib.rs | |
parent | 5aa1bba107ef434e61c3136120b9478a307d67a9 (diff) |
pull function out into new crate ra_env; use in ra_flycheck as well
Diffstat (limited to 'crates/ra_project_model/src/lib.rs')
-rw-r--r-- | crates/ra_project_model/src/lib.rs | 4 |
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 | ||
3 | mod cargo_workspace; | 3 | mod cargo_workspace; |
4 | mod find_executables; | ||
5 | mod json_project; | 4 | mod json_project; |
6 | mod sysroot; | 5 | mod sysroot; |
7 | 6 | ||
@@ -15,6 +14,7 @@ use std::{ | |||
15 | use anyhow::{bail, Context, Result}; | 14 | use anyhow::{bail, Context, Result}; |
16 | use ra_cfg::CfgOptions; | 15 | use ra_cfg::CfgOptions; |
17 | use ra_db::{CrateGraph, CrateName, Edition, Env, ExternSource, ExternSourceId, FileId}; | 16 | use ra_db::{CrateGraph, CrateName, Edition, Env, ExternSource, ExternSourceId, FileId}; |
17 | use ra_env::get_path_for_executable; | ||
18 | use rustc_hash::FxHashMap; | 18 | use rustc_hash::FxHashMap; |
19 | use serde_json::from_reader; | 19 | use 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()]); |