nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #14712 - Veykril:metadata-extra-args, r=Veykril

Browse Source 
fix: Only pass unstable flags to cargo metadata from extra args config
This commit is contained in:
bors 2023-05-02 16:34:39 +00:00
commit a7168a8c6f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,12 +294,25 @@ 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(); let mut other_options = vec![];
// cargo metadata only supports a subset of flags of what cargo usually accepts, and usually
// the only relevant flags for metadata here are unstable ones, so we pass those along
// but nothing else
let mut extra_args = config.extra_args.iter();
while let Some(arg) = extra_args.next() {
if arg == "-Z" {
if let Some(arg) = extra_args.next() {
other_options.push("-Z".to_owned());
other_options.push(arg.to_owned());
}
}
}
if !targets.is_empty() { if !targets.is_empty() {
other_options.append( other_options.append(
&mut targets &mut targets
.into_iter() .into_iter()
.flat_map(|target| ["--filter-platform".to_string(), target]) .flat_map(|target| ["--filter-platform".to_owned().to_string(), target])
.collect(), .collect(),
); );
} }