itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-03 13:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #14642 - jakhh8:master, r=Veykril

Browse Source 
minor: Use `CargoConfig.extra_args` for fetching metadata

Fixes #14510
This commit is contained in:
bors 2023-04-25 12:46:29 +00:00
commit 943d2a8a1c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/project-model/src/cargo_workspace.rs
View File

@ -293,13 +293,16 @@ impl CargoWorkspace {
} }
meta.current_dir(current_dir.as_os_str()); meta.current_dir(current_dir.as_os_str());
let mut other_options = config.extra_args.clone();
if !targets.is_empty() { if !targets.is_empty() {
let other_options: Vec<_> = targets other_options.append(
.into_iter() &mut targets
.flat_map(|target| ["--filter-platform".to_string(), target]) .into_iter()
.collect(); .flat_map(|target| ["--filter-platform".to_string(), target])
meta.other_options(other_options); .collect(),
);
} }
meta.other_options(other_options);
// FIXME: Fetching metadata is a slow process, as it might require // FIXME: Fetching metadata is a slow process, as it might require
// calling crates.io. We should be reporting progress here, but it's // calling crates.io. We should be reporting progress here, but it's