Expose a cargo function instead of CargoCommand::new, and rename CargoCommand as Command

Signed-off-by: Jorge Prendes <jorge.prendes@gmail.com>

Author: jprendes

src/cargo.rs src/cargo_cmd.rssrc/cargo.rs renamed to src/cargo_cmd.rs

@@ -25,7 +25,7 @@ pub trait CargoCmd {
     fn checked_status(&mut self) -> Result<()>;
 }
 
-pub fn cargo() -> Result<Command> {
+pub fn cargo_cmd() -> Result<Command> {
     let cargo = match env::var_os("CARGO") {
         Some(cargo) => Path::new(&cargo).canonicalize()?,
         None => which::which("cargo")?.canonicalize()?,

src/cli.rs

@@ -8,7 +8,7 @@ use anyhow::{Context, Result};
 use clap::{Parser, Subcommand};
 use const_format::formatcp;
 
-use crate::cargo::{CargoCmd as _, cargo};
+use crate::cargo_cmd::{CargoCmd as _, cargo_cmd};
 
 pub struct Args {
     pub manifest_path: Option<PathBuf>,
@@ -111,7 +111,7 @@ fn resolve_target_dir(
     env: &HashMap<OsString, OsString>,
     cwd: &PathBuf,
 ) -> Result<PathBuf> {
-    let output = cargo()?
+    let output = cargo_cmd()?
         .env_clear()
         .envs(env.iter())
         .current_dir(cwd)
@@ -129,7 +129,7 @@ fn resolve_target_dir(
 }
 
 fn resolve_target(env: &HashMap<OsString, OsString>, cwd: &PathBuf) -> Result<String> {
-    let output = cargo()?
+    let output = cargo_cmd()?
         .env_clear()
         .envs(env.iter())
         .current_dir(cwd)