From 52a70c392e6099b3475fac5ad0d920fc3e0f5070 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 19 Jul 2021 21:21:41 +0300 Subject: [PATCH] minor: simplify --- crates/project_model/src/cargo_workspace.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs index f7d8218db74..8e66f240909 100644 --- a/crates/project_model/src/cargo_workspace.rs +++ b/crates/project_model/src/cargo_workspace.rs @@ -229,6 +229,12 @@ pub fn fetch_metadata( config: &CargoConfig, progress: &dyn Fn(String), ) -> Result { + let target = config + .target + .clone() + .or_else(|| cargo_config_build_target(cargo_toml)) + .or_else(|| rustc_discover_host_triple(cargo_toml)); + let mut meta = MetadataCommand::new(); meta.cargo_path(toolchain::cargo()); meta.manifest_path(cargo_toml.to_path_buf()); @@ -245,13 +251,7 @@ pub fn fetch_metadata( } } meta.current_dir(cargo_toml.parent().as_os_str()); - let target = if let Some(target) = &config.target { - Some(target.clone()) - } else if let stdout @ Some(_) = cargo_config_build_target(cargo_toml) { - stdout - } else { - rustc_discover_host_triple(cargo_toml) - }; + if let Some(target) = target { meta.other_options(vec![String::from("--filter-platform"), target]); } -- 2.44.0