mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor: simplify

Browse Source
This commit is contained in:
Aleksey Kladov 2021-07-19 21:21:41 +03:00
parent 493ed2c17b
commit 52a70c392e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/project_model/src/cargo_workspace.rs
View File

@ -229,6 +229,12 @@ impl CargoWorkspace {
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 @@ impl CargoWorkspace {
}
}
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]);
}