diff options
| author | bors <bors@rust-lang.org> | 2023-04-25 12:46:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-25 12:46:29 +0000 |
| commit | 943d2a8a1ca15e8b28a1f51f5a5c135e3728da04 (patch) | |
| tree | 453812c0d5677f9fbc369a15505e75e84b0a31aa | |
| parent | 59fcd00447a337678ca0caa01ad3ddca6479650d (diff) | |
| parent | 62c9d96c67f804d13083b9ecf5fcbcace8c676a6 (diff) | |
Auto merge of #14642 - jakhh8:master, r=Veykril
minor: Use `CargoConfig.extra_args` for fetching metadata Fixes #14510
| -rw-r--r-- | crates/project-model/src/cargo_workspace.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/crates/project-model/src/cargo_workspace.rs b/crates/project-model/src/cargo_workspace.rs index 01162b1a8ba..fb98d61963c 100644 --- a/crates/project-model/src/cargo_workspace.rs +++ b/crates/project-model/src/cargo_workspace.rs @@ -293,13 +293,16 @@ impl CargoWorkspace { } meta.current_dir(current_dir.as_os_str()); + let mut other_options = config.extra_args.clone(); if !targets.is_empty() { - let other_options: Vec<_> = targets - .into_iter() - .flat_map(|target| ["--filter-platform".to_string(), target]) - .collect(); - meta.other_options(other_options); + other_options.append( + &mut targets + .into_iter() + .flat_map(|target| ["--filter-platform".to_string(), target]) + .collect(), + ); } + meta.other_options(other_options); // FIXME: Fetching metadata is a slow process, as it might require // calling crates.io. We should be reporting progress here, but it's |