]> git.lizzy.rs Git - rust.git/commitdiff
minor: simplify
authorAleksey Kladov <aleksey.kladov@gmail.com>
Mon, 19 Jul 2021 18:21:41 +0000 (21:21 +0300)
committerAleksey Kladov <aleksey.kladov@gmail.com>
Mon, 19 Jul 2021 18:21:41 +0000 (21:21 +0300)
crates/project_model/src/cargo_workspace.rs

index f7d8218db74abd0ba8851762a5287a704caa2907..8e66f240909291dbe994761526ea37f8c86417db 100644 (file)
@@ -229,6 +229,12 @@ pub fn fetch_metadata(
         config: &CargoConfig,
         progress: &dyn Fn(String),
     ) -> Result<cargo_metadata::Metadata> {
+        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]);
         }