CLI and library build with more optional inputs.

Author: joaander

src/cli/submit.rs

@@ -92,7 +92,7 @@ pub fn submit<W: Write>(
             for group in &groups {
                 if !whole_groups.contains(group) {
                     return Err(Box::new(row::Error::PartialGroupSubmission(
-                        action.name().clone(),
+                        action.name().into(),
                     )));
                 }
             }
@@ -231,7 +231,7 @@ pub fn submit<W: Write>(
             "[{}/{}] Submitting action '{}' on directory {}",
             HumanCount((index + 1) as u64),
             HumanCount(action_directories.len() as u64),
-            style(action.name().clone()).blue(),
+            style(action.name().to_string()).blue(),
             style(directories[0].display().to_string()).bold()
         );
         if directories.len() > 1 {

src/lib.rs

@@ -105,9 +105,6 @@ pub enum Error {
     PostcardSerialize(PathBuf, #[source] postcard::Error),
 
     // workflow errors
-    #[error("Found duplicate action definition '{0}'.")]
-    DuplicateAction(String),
-
     #[error("Previous action '{0}' not found in action '{1}'.")]
     PreviousActionNotFound(String, String),
 

src/project.rs

@@ -252,7 +252,7 @@ impl Project {
             } else if self.state.is_submitted(action.name(), &directory_name) {
                 status.submitted.push(directory_name);
             } else if action
-                .previous_actions
+                .previous_actions()
                 .iter()
                 .all(|a| completed[a].contains(&directory_name))
             {

src/scheduler/bash.rs

@@ -99,7 +99,7 @@ export ACTION_WALLTIME_IN_MINUTES="{}"
             self.cluster_name, self.action.name(), self.total_processes, self.walltime_in_minutes,
         );
 
-        if let Processes::PerDirectory(processes_per_directory) = self.action.resources.processes {
+        if let Processes::PerDirectory(processes_per_directory) = self.action.resources.processes() {
             let _ = writeln!(
                 result,
                 "export ACTION_PROCESSES_PER_DIRECTORY=\"{processes_per_directory}\"",
@@ -158,16 +158,16 @@ trap 'printf %s\\n "${{directories[@]}}" | {row_executable} scan --no-progress -
         let contains_directories = self.action.command().contains("{directories}");
         if contains_directory && contains_directories {
             return Err(Error::ActionContainsMultipleTemplates(
-                self.action.name().clone(),
+                self.action.name().into(),
             ));
         }
 
         // Build up launcher prefix
         let mut launcher_prefix = String::new();
         let mut process_launchers = 0;
-        for launcher in &self.action.launchers {
+        for launcher in self.action.launchers() {
             let launcher = self.launchers.get(launcher).ok_or_else(|| {
-                Error::LauncherNotFound(launcher.clone(), self.action.name().clone())
+                Error::LauncherNotFound(launcher.clone(), self.action.name().into())
             })?;
             launcher_prefix
                 .push_str(&launcher.prefix(&self.action.resources, self.directories.len()));
@@ -178,12 +178,12 @@ trap 'printf %s\\n "${{directories[@]}}" | {row_executable} scan --no-progress -
 
         if self.total_processes > 1 && process_launchers == 0 {
             return Err(Error::NoProcessLauncher(
-                self.action.name().clone(),
+                self.action.name().into(),
                 self.total_processes,
             ));
         }
         if process_launchers > 1 {
-            return Err(Error::TooManyProcessLaunchers(self.action.name().clone()));
+            return Err(Error::TooManyProcessLaunchers(self.action.name().into()));
         }
 
         if contains_directory {
@@ -207,7 +207,7 @@ done
 "#
             ))
         } else {
-            Err(Error::ActionContainsNoTemplate(self.action.name().clone()))
+            Err(Error::ActionContainsNoTemplate(self.action.name().into()))
         }
     }
 
@@ -283,7 +283,7 @@ impl Scheduler for Bash {
                 },
                 Some(code) => format!("exited with code {code}"),
             };
-            return Err(Error::ExecuteAction(action.name().clone(), message));
+            return Err(Error::ExecuteAction(action.name().into(), message));
         }
 
         Ok(None)

src/scheduler/slurm.rs

@@ -190,7 +190,7 @@ impl Scheduler for Slurm {
                 },
                 Some(code) => format!("sbatch exited with code {code}"),
             };
-            Err(Error::SubmitAction(action.name().clone(), message))
+            Err(Error::SubmitAction(action.name().into(), message))
         }
     }
 

src/state.rs

@@ -181,7 +181,7 @@ impl State {
         // Ensure that completed has keys for all actions in the workflow.
         for action in &workflow.action {
             if !state.completed.contains_key(action.name()) {
-                state.completed.insert(action.name().clone(), HashSet::new());
+                state.completed.insert(action.name().into(), HashSet::new());
             }
         }
 
@@ -527,7 +527,7 @@ impl State {
     /// Remove missing completed actions and directories.
     fn remove_missing_completed(&mut self, workflow: &Workflow) {
         let current_actions: HashSet<String> =
-            workflow.action.iter().map(|a| a.name().clone()).collect();
+            workflow.action.iter().map(|a| a.name().into()).collect();
 
         let actions_to_remove: Vec<String> = self
             .completed
@@ -560,7 +560,7 @@ impl State {
     /// Remove missing submitted actions and directories.
     fn remove_missing_submitted(&mut self, workflow: &Workflow) {
         let current_actions: HashSet<String> =
-            workflow.action.iter().map(|a| a.name().clone()).collect();
+            workflow.action.iter().map(|a| a.name().into()).collect();
 
         let actions_to_remove: Vec<String> = self
             .submitted