build script: move Command run logic to .run()

Author: Firestar99

crates/cargo-gpu/src/main.rs

@@ -124,40 +124,8 @@ fn run() -> anyhow::Result<()> {
         })
         .collect::<Vec<_>>();
     log::trace!("CLI args: {env_args:#?}");
-    let cli = Cli::parse_from(env_args.clone());
-
-    match cli.command {
-        Command::Install(install) => {
-            let shader_crate_path = install.shader_crate;
-            let command =
-                config::Config::clap_command_with_cargo_config(&shader_crate_path, env_args)?;
-            log::debug!(
-                "installing with final merged arguments: {:#?}",
-                command.install
-            );
-            command.install.run()?;
-        }
-        Command::Build(build) => {
-            let shader_crate_path = build.install.shader_crate;
-            let mut command =
-                config::Config::clap_command_with_cargo_config(&shader_crate_path, env_args)?;
-            log::debug!("building with final merged arguments: {command:#?}");
-
-            if command.build.watch {
-                //  When watching, do one normal run to setup the `manifest.json` file.
-                command.build.watch = false;
-                command.run()?;
-                command.build.watch = true;
-                command.run()?;
-            } else {
-                command.run()?;
-            }
-        }
-        Command::Show(show) => show.run()?,
-        Command::DumpUsage => dump_full_usage_for_readme()?,
-    }
-
-    Ok(())
+    let cli = Cli::parse_from(&env_args);
+    cli.command.run(env_args)
 }
 
 /// All of the available subcommands for `cargo gpu`
@@ -179,6 +147,45 @@ enum Command {
     DumpUsage,
 }
 
+impl Command {
+    /// run the command
+    pub fn run(&self, env_args: Vec<String>) -> anyhow::Result<()> {
+        match &self {
+            Self::Install(install) => {
+                let shader_crate_path = &install.shader_crate;
+                let command =
+                    config::Config::clap_command_with_cargo_config(shader_crate_path, env_args)?;
+                log::debug!(
+                    "installing with final merged arguments: {:#?}",
+                    command.install
+                );
+                command.install.run()?;
+            }
+            Self::Build(build) => {
+                let shader_crate_path = &build.install.shader_crate;
+                let mut command =
+                    config::Config::clap_command_with_cargo_config(shader_crate_path, env_args)?;
+                log::debug!("building with final merged arguments: {command:#?}");
+
+                if command.build.watch {
+                    //  When watching, do one normal run to setup the `manifest.json` file.
+                    command.build.watch = false;
+                    command.run()?;
+                    command.build.watch = true;
+                    command.run()?;
+                } else {
+                    command.run()?;
+                }
+            }
+            Self::Show(show) => show.run()?,
+            Self::DumpUsage => dump_full_usage_for_readme()?,
+        }
+
+        Ok(())
+    }
+}
+
+/// the Cli struct representing the main cli
 #[derive(clap::Parser)]
 #[clap(author, version, about, subcommand_required = true)]
 pub(crate) struct Cli {

crates/cargo-gpu/src/show.rs

@@ -33,25 +33,25 @@ pub struct Show {
 
 impl Show {
     /// Entrypoint
-    pub fn run(self) -> anyhow::Result<()> {
+    pub fn run(&self) -> anyhow::Result<()> {
         log::info!("{:?}: ", self.command);
 
         #[expect(
             clippy::print_stdout,
             reason = "The output of this command could potentially be used in a script, \
                       so we _don't_ want to use `crate::user_output`, as that prefixes a crab."
         )]
-        match self.command {
+        match &self.command {
             Info::CacheDirectory => {
                 println!("{}\n", cache_dir()?.display());
             }
             Info::SpirvSource(SpirvSourceDep { shader_crate }) => {
                 let rust_gpu_source =
-                    crate::spirv_source::SpirvSource::get_rust_gpu_deps_from_shader(&shader_crate)?;
+                    crate::spirv_source::SpirvSource::get_rust_gpu_deps_from_shader(shader_crate)?;
                 println!("{rust_gpu_source}\n");
             }
             Info::Commitsh => {
-                println!("{}", std::env!("GIT_HASH"));
+                println!("{}", env!("GIT_HASH"));
             }
             Info::Capabilities => {
                 println!("All available options to the `cargo gpu build --capabilities` argument:");