Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 05:53:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

internal: Swallow error: config value is not set cargo error

Browse source
This commit is contained in:
Lukas Wirth 2024-12-26 16:13:11 +01:00
parent bfc223e857
commit e820c4da90
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
crates/project-model/src/target_triple.rs
View file

@ -23,11 +23,8 @@ pub(super) fn get(
let sysroot = match config { let sysroot = match config {
TargetTipleConfig::Cargo(sysroot, cargo_toml) => { TargetTipleConfig::Cargo(sysroot, cargo_toml) => {
match cargo_config_build_target(cargo_toml, extra_env, sysroot) { match cargo_config_build_target(cargo_toml, extra_env, sysroot) {
Ok(it) => return Ok(it), Some(it) => return Ok(it),
Err(e) => { None => sysroot,
tracing::warn!("failed to run `cargo rustc --print cfg`, falling back to invoking rustc directly: {e}");
sysroot
}
} }
} }
TargetTipleConfig::Rustc(sysroot) => sysroot, TargetTipleConfig::Rustc(sysroot) => sysroot,
@ -58,7 +55,7 @@ fn cargo_config_build_target(
cargo_toml: &ManifestPath, cargo_toml: &ManifestPath,
extra_env: &FxHashMap<String, String>, extra_env: &FxHashMap<String, String>,
sysroot: &Sysroot, sysroot: &Sysroot,
) -> anyhow::Result<Vec<String>> { ) -> Option<Vec<String>> {
let mut cargo_config = sysroot.tool(Tool::Cargo); let mut cargo_config = sysroot.tool(Tool::Cargo);
cargo_config.envs(extra_env); cargo_config.envs(extra_env);
cargo_config cargo_config
@ -68,7 +65,9 @@ fn cargo_config_build_target(
// if successful we receive `build.target = "target-triple"` // if successful we receive `build.target = "target-triple"`
// or `build.target = ["<target 1>", ..]` // or `build.target = ["<target 1>", ..]`
tracing::debug!("Discovering cargo config target by {:?}", cargo_config); tracing::debug!("Discovering cargo config target by {:?}", cargo_config);
utf8_stdout(cargo_config).and_then(parse_output_cargo_config_build_target) // this might be `error: config value `build.target` is not set` in which case we
// don't wanna log the error
utf8_stdout(cargo_config).and_then(parse_output_cargo_config_build_target).ok()
} }
fn parse_output_cargo_config_build_target(stdout: String) -> anyhow::Result<Vec<String>> { fn parse_output_cargo_config_build_target(stdout: String) -> anyhow::Result<Vec<String>> {