bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/project-model/src/rustc_cfg.rs')
-rw-r--r--crates/project-model/src/rustc_cfg.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/crates/project-model/src/rustc_cfg.rs b/crates/project-model/src/rustc_cfg.rs
index 001296fb00..501b1fdc8c 100644
--- a/crates/project-model/src/rustc_cfg.rs
+++ b/crates/project-model/src/rustc_cfg.rs
@@ -1,9 +1,8 @@
//! Runs `rustc --print cfg` to get built-in cfg flags.
-use std::process::Command;
-
use anyhow::Context;
use rustc_hash::FxHashMap;
+use toolchain::Tool;
use crate::{cfg_flag::CfgFlag, utf8_stdout, ManifestPath, Sysroot};
@@ -69,8 +68,8 @@ fn get_rust_cfgs(
) -> anyhow::Result<String> {
let sysroot = match config {
RustcCfgConfig::Cargo(sysroot, cargo_toml) => {
- let mut cmd = Command::new(toolchain::Tool::Cargo.path());
- Sysroot::set_rustup_toolchain_env(&mut cmd, sysroot);
+ let mut cmd = Sysroot::tool(sysroot, Tool::Cargo);
+
cmd.envs(extra_env);
cmd.current_dir(cargo_toml.parent())
.args(["rustc", "-Z", "unstable-options", "--print", "cfg"])
@@ -90,7 +89,7 @@ fn get_rust_cfgs(
RustcCfgConfig::Rustc(sysroot) => sysroot,
};
- let mut cmd = Sysroot::rustc(sysroot);
+ let mut cmd = Sysroot::tool(sysroot, Tool::Rustc);
cmd.envs(extra_env);
cmd.args(["--print", "cfg", "-O"]);
if let Some(target) = target {