refactor: simplify command handling

Author: jnsgruk

src/main.rs

@@ -119,19 +119,31 @@ fn main() -> Result<()> {
 
     // Handle subcommands
     match args.cmd {
-        Commands::Enable => {
-            confirm_or_exit(args.yes);
+        Commands::Enable => enable(&system, selected, args.yes),
+        Commands::Disable => disable(selected, args.yes),
+    }
+}
 
-            info!("Updating apt package cache");
-            system.update_package_lists()?;
+/// Enables selected experiments
+fn enable<'a>(system: &'a impl Worker, experiments: Vec<Experiment>, yes: bool) -> Result<()> {
+    confirm_or_exit(yes);
 
-            enable(selected)
-        }
-        Commands::Disable => {
-            confirm_or_exit(args.yes);
-            disable(selected)
-        }
+    info!("Updating apt package cache");
+    system.update_package_lists()?;
+
+    for e in experiments.iter() {
+        e.enable()?;
+    }
+    Ok(())
+}
+
+// Disable selected experiments
+fn disable(experiments: Vec<Experiment<'_>>, yes: bool) -> Result<()> {
+    confirm_or_exit(yes);
+    for e in experiments.iter() {
+        e.disable()?;
     }
+    Ok(())
 }
 
 /// Get selected experiments from the command line arguments.
@@ -189,22 +201,6 @@ fn confirm_or_exit(yes: bool) {
     }
 }
 
-/// Enables selected experiments
-fn enable(experiments: Vec<Experiment>) -> Result<()> {
-    for e in experiments.iter() {
-        e.enable()?;
-    }
-    Ok(())
-}
-
-// Disable selected experiments
-fn disable(experiments: Vec<Experiment<'_>>) -> Result<()> {
-    for e in experiments.iter() {
-        e.disable()?;
-    }
-    Ok(())
-}
-
 // Default experiments to enable if none are specified
 fn default_experiments() -> Vec<String> {
     let mut defaults = vec!["coreutils".to_string(), "sudo-rs".to_string()];