mirrors/cargo-expand
1
0
Fork 0
mirror of https://github.com/dtolnay/cargo-expand.git synced 2025-04-04 05:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Reorder apply_args to match struct definition

Browse source
This commit is contained in:
David Tolnay 2023-09-23 13:39:40 -07:00
parent 753595e549
commit 905b808589
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

100
src/main.rs
View file

@ -261,32 +261,28 @@ fn apply_args(cmd: &mut Command, args: &Expand, color: &Coloring, outfile: &Path
line.arg("rustc");
line.arg("--profile");
if let Some(profile) = &args.profile {
line.arg(profile);
} else if args.tests && args.test.is_none() {
if args.release {
line.arg("bench");
if args.verbose {
line.arg("--verbose");
}
line.arg("--color");
match color {
Coloring::Auto => line.arg(if cfg!(not(windows)) && io::stderr().is_terminal() {
"always"
} else {
line.arg("test");
}
} else if args.release {
line.arg("release");
} else {
line.arg("check");
"never"
}),
color => line.arg(color.to_possible_value().unwrap().get_name()),
}
if let Some(features) = &args.features {
line.arg("--features");
line.arg(features);
for unstable_flag in &args.unstable_flags {
line.arg("-Z");
line.arg(unstable_flag);
}
if args.all_features {
line.arg("--all-features");
}
if args.no_default_features {
line.arg("--no-default-features");
if let Some(package) = &args.package {
line.arg("--package");
line.args(package);
}
let mut has_explicit_build_target = false;
@ -330,6 +326,39 @@ fn apply_args(cmd: &mut Command, args: &Expand, color: &Coloring, outfile: &Path
}
}
if let Some(features) = &args.features {
line.arg("--features");
line.arg(features);
}
if args.all_features {
line.arg("--all-features");
}
if args.no_default_features {
line.arg("--no-default-features");
}
if let Some(jobs) = args.jobs {
line.arg("--jobs");
line.arg(jobs.to_string());
}
line.arg("--profile");
if let Some(profile) = &args.profile {
line.arg(profile);
} else if args.tests && args.test.is_none() {
if args.release {
line.arg("bench");
} else {
line.arg("test");
}
} else if args.release {
line.arg("release");
} else {
line.arg("check");
}
if let Some(target) = &args.target {
line.arg("--target");
line.arg(target);
@ -345,30 +374,6 @@ fn apply_args(cmd: &mut Command, args: &Expand, color: &Coloring, outfile: &Path
line.arg(manifest_path);
}
if let Some(package) = &args.package {
line.arg("--package");
line.args(package);
}
if let Some(jobs) = args.jobs {
line.arg("--jobs");
line.arg(jobs.to_string());
}
if args.verbose {
line.arg("--verbose");
}
line.arg("--color");
match color {
Coloring::Auto => line.arg(if cfg!(not(windows)) && io::stderr().is_terminal() {
"always"
} else {
"never"
}),
color => line.arg(color.to_possible_value().unwrap().get_name()),
}
if args.frozen {
line.arg("--frozen");
}
@ -381,11 +386,6 @@ fn apply_args(cmd: &mut Command, args: &Expand, color: &Coloring, outfile: &Path
line.arg("--offline");
}
for unstable_flag in &args.unstable_flags {
line.arg("-Z");
line.arg(unstable_flag);
}
line.arg("--");
line.arg("-o");