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

Move fallible print_command out of apply_args

Browse source
This commit is contained in:
David Tolnay 2024-04-06 10:41:21 -07:00
parent 1f5c8900fd
commit 5c607447c1
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main.rs
View file

@ -170,7 +170,10 @@ fn do_cargo_expand() -> Result<i32> {
// Run cargo
let mut cmd = Command::new(cargo_binary());
apply_args(&mut cmd, &args, color, &outfile_path)?;
apply_args(&mut cmd, &args, color, &outfile_path);
if args.verbose {
print_command(&cmd, color)?;
}
if needs_rustc_bootstrap() {
if let Ok(current_exe) = env::current_exe() {
@ -319,7 +322,7 @@ fn which_rustfmt() -> Option<PathBuf> {
}
}
fn apply_args(cmd: &mut Command, args: &Expand, color: Coloring, outfile: &Path) -> Result<()> {
fn apply_args(cmd: &mut Command, args: &Expand, color: Coloring, outfile: &Path) {
cmd.arg("rustc");
if args.verbose {
@ -464,12 +467,6 @@ fn apply_args(cmd: &mut Command, args: &Expand, color: Coloring, outfile: &Path)
cmd.arg("-o");
cmd.arg(outfile);
cmd.arg(ARG_Z_UNPRETTY_EXPANDED);
if args.verbose {
print_command(cmd, color)?;
}
Ok(())
}
fn needs_rustc_bootstrap() -> bool {