Removes "parse()" from XTaskArg (#11)

Removes clap parsing from run method, so XTaskArgs can be used in a composable way.
linebender · Dec 17, 2024 · f7843ed · f7843ed
1 parent 5a49edd
commit f7843ed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/example/Cargo.lock b/example/Cargo.lock
diff --git a/example/xtask_kompari/Cargo.toml b/example/xtask_kompari/Cargo.toml
@@ -4,5 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-demolib = { path = "../demolib"}
+demolib = { path = "../demolib" }
+clap = { version = "4.5", features = ["derive"] }
 kompari = { path = "../..", features = ["xtask-cli"] }
diff --git a/example/xtask_kompari/src/main.rs b/example/xtask_kompari/src/main.rs
@@ -1,6 +1,7 @@
 // Copyright 2024 the Kompari Authors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
+use clap::Parser;
 use kompari::xtask_cli::{XtaskActions, XtaskArgs};
 use std::path::Path;
 use std::process::Command;
@@ -26,5 +27,5 @@ fn main() -> kompari::Result<()> {
     let current_path = tests_path.join("current");
     let snapshots_path = tests_path.join("snapshots");
 
-    XtaskArgs::run(&current_path, &snapshots_path, XtaskActionsImpl())
+    XtaskArgs::parse().run(&current_path, &snapshots_path, XtaskActionsImpl())
 }
diff --git a/src/xtask_cli.rs b/src/xtask_cli.rs
@@ -43,20 +43,20 @@ pub trait XtaskActions {
 
 impl XtaskArgs {
     pub fn run(
+        &self,
         current_path: &Path,
         snapshots_path: &Path,
         actions: impl XtaskActions,
     ) -> crate::Result<()> {
-        let args = XtaskArgs::parse();
-        match args.command {
+        match &self.command {
             XtaskCommand::Report(report_args) => {
-                create_report(current_path, snapshots_path, &report_args)?;
+                create_report(current_path, snapshots_path, report_args)?;
             }
             XtaskCommand::Clean => {
                 clean_image_dir(current_path)?;
             }
             XtaskCommand::DeadSnapshots(ds_args) => {
-                process_dead_snapshots(current_path, snapshots_path, actions, &ds_args)?;
+                process_dead_snapshots(current_path, snapshots_path, actions, ds_args)?;
             }
         }
         Ok(())