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.rs32
1 files changed, 19 insertions, 13 deletions
diff --git a/crates/project-model/src/rustc_cfg.rs b/crates/project-model/src/rustc_cfg.rs
index efbdfffd9a..1d07e4a8a6 100644
--- a/crates/project-model/src/rustc_cfg.rs
+++ b/crates/project-model/src/rustc_cfg.rs
@@ -67,7 +67,7 @@ fn get_rust_cfgs(
extra_env: &FxHashMap<String, String>,
config: RustcCfgConfig<'_>,
) -> anyhow::Result<String> {
- match config {
+ let sysroot = match config {
RustcCfgConfig::Cargo(sysroot, cargo_oml) => {
let cargo = Sysroot::discover_tool(sysroot, toolchain::Tool::Cargo)?;
let mut cmd = Command::new(cargo);
@@ -79,19 +79,25 @@ fn get_rust_cfgs(
cmd.args(["--target", target]);
}
- utf8_stdout(cmd).context("Unable to run `cargo rustc`")
- }
- RustcCfgConfig::Rustc(sysroot) => {
- let rustc = Sysroot::discover_tool(sysroot, toolchain::Tool::Rustc)?;
- tracing::debug!(?rustc, "using explicit rustc from sysroot");
- let mut cmd = Command::new(rustc);
- cmd.envs(extra_env);
- cmd.args(["--print", "cfg", "-O"]);
- if let Some(target) = target {
- cmd.args(["--target", target]);
+ match utf8_stdout(cmd) {
+ Ok(it) => return Ok(it),
+ Err(e) => {
+ tracing::warn!("failed to run `cargo rustc --print cfg`, falling back to invoking rustc directly: {e}");
+ sysroot
+ }
}
-
- utf8_stdout(cmd).context("Unable to run `rustc`")
}
+ RustcCfgConfig::Rustc(sysroot) => sysroot,
+ };
+
+ let rustc = Sysroot::discover_tool(sysroot, toolchain::Tool::Rustc)?;
+ tracing::debug!(?rustc, "using explicit rustc from sysroot");
+ let mut cmd = Command::new(rustc);
+ cmd.envs(extra_env);
+ cmd.args(["--print", "cfg", "-O"]);
+ if let Some(target) = target {
+ cmd.args(["--target", target]);
}
+
+ utf8_stdout(cmd).context("unable to fetch cfgs via `rustc --print cfg -O`")
}