refactor: pass around a reference to a State, not a statedir path

Gotta use them types.

Signed-off-by: Lars Wirzenius <liw@liw.fi>
Sponsored-by: author

4 files changed, 16 insertions, 11 deletions

diff --git a/src/action.rs b/src/action.rs
index fd31c68..de4dd18 100644
--- a/src/action.rs
+++ b/src/action.rs
@@ -7,7 +7,7 @@ use log::{debug, info};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    project::Project,
+    project::{Project, State},
     qemu,
     vdrive::{VirtualDriveBuilder, VirtualDriveError},
 };
@@ -28,10 +28,10 @@ impl PreAction {
         &["dummy", "pwd", "cargo_fetch"]
     }
 
-    pub fn execute(&self, project: &Project, state: &Path) -> Result<(), ActionError> {
+    pub fn execute(&self, project: &Project, state: &State) -> Result<(), ActionError> {
         debug!("Plan::execute: {:#?}", self);
         match self {
-            Self::Dummy => dummy(state),
+            Self::Dummy => dummy(),
             Self::Pwd => pwd(project),
             Self::CargoFetch => cargo_fetch(project, state),
         }
@@ -51,16 +51,16 @@ impl PostAction {
         &["dummy", "pwd"]
     }
 
-    pub fn execute(&self, project: &Project, state: &Path) -> Result<(), ActionError> {
+    pub fn execute(&self, project: &Project, _state: &State) -> Result<(), ActionError> {
         debug!("Plan::execute: {:#?}", self);
         match self {
-            Self::Dummy => dummy(state),
+            Self::Dummy => dummy(),
             Self::Pwd => pwd(project),
         }
     }
 }
 
-fn dummy(_state: &Path) -> Result<(), ActionError> {
+fn dummy() -> Result<(), ActionError> {
     println!("dummy action");
     Ok(())
 }
@@ -70,8 +70,8 @@ fn pwd(project: &Project) -> Result<(), ActionError> {
     Ok(())
 }
 
-fn cargo_fetch(project: &Project, state: &Path) -> Result<(), ActionError> {
-    let cargo_home = state.join("dependencies"); // FIXME: hardcoded pathname
+fn cargo_fetch(project: &Project, state: &State) -> Result<(), ActionError> {
+    let cargo_home = state.statedir().join("dependencies"); // FIXME: hardcoded pathname
     if !cargo_home.exists() {
         std::fs::create_dir(&cargo_home).map_err(|e| ActionError::Mkdir(cargo_home.clone(), e))?;
     }
diff --git a/src/project.rs b/src/project.rs
index 658d075..8ffc03d 100644
--- a/src/project.rs
+++ b/src/project.rs
@@ -178,6 +178,11 @@ impl State {
         Ok(())
     }
 
+    /// Return state directory.
+    pub fn statedir(&self) -> &Path {
+        &self.statedir
+    }
+
     /// Return artifacts directory for project.
     pub fn artifactsdir(&self) -> PathBuf {
         self.statedir.join("artifacts")
diff --git a/src/run.rs b/src/run.rs
index 51ef379..9c2a25d 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -62,7 +62,7 @@ fn cmd_run(config: &EffectiveConfig, run: &RunCommand) -> Result<(), RunError> {
 
             debug!("Executing pre-plan steps");
             for action in project.pre_plan() {
-                action.execute(project, statedir)?;
+                action.execute(project, &state)?;
             }
 
             debug!("Executing CI run");
@@ -141,7 +141,7 @@ fn cmd_run(config: &EffectiveConfig, run: &RunCommand) -> Result<(), RunError> {
 
             debug!("Executing post-plan steps");
             for action in project.post_plan() {
-                action.execute(project, statedir)?;
+                action.execute(project, &state)?;
             }
 
             if is_git(project.source()) {
diff --git a/src/util.rs b/src/util.rs
index ef7baee..a9ecfe2 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -38,7 +38,7 @@ pub fn recreate_dir(dirname: &Path) -> Result<(), UtilError> {
     if dirname.exists() {
         std::fs::remove_dir_all(dirname).map_err(|e| UtilError::RemoveDir(dirname.into(), e))?;
     }
-    mkdir(&dirname)?;
+    mkdir(dirname)?;
     Ok(())
 }