1 files changed, 20 insertions, 18 deletions

diff --git a/subplotlib/src/steplibrary/runcmd.rs b/subplotlib/src/steplibrary/runcmd.rs
index b90f8b7..99605a3 100644
--- a/subplotlib/src/steplibrary/runcmd.rs
+++ b/subplotlib/src/steplibrary/runcmd.rs
@@ -56,7 +56,9 @@ static DEFAULT_PATHS: &[&str] = &[
 ];
 
 // This us used internally to force CWD for running commands
-const USE_CWD: &str = "\0USE_CWD";
+lazy_static! {
+    static ref USE_CWD: PathBuf = PathBuf::from("\0USE_CWD");
+}
 
 impl ContextElement for Runcmd {
     fn scenario_starts(&mut self) -> StepResult {
@@ -229,7 +231,7 @@ pub fn run(context: &ScenarioContext, argv0: &str, args: &str) {
 #[step]
 #[context(Datadir)]
 #[context(Runcmd)]
-pub fn run_in(context: &ScenarioContext, dirname: &str, argv0: &str, args: &str) {
+pub fn run_in(context: &ScenarioContext, dirname: &Path, argv0: &str, args: &str) {
     try_to_run_in::call(context, dirname, argv0, args)?;
     exit_code_is::call(context, 0)?;
 }
@@ -244,7 +246,7 @@ pub fn run_in(context: &ScenarioContext, dirname: &str, argv0: &str, args: &str)
 #[context(Datadir)]
 #[context(Runcmd)]
 pub fn try_to_run(context: &ScenarioContext, argv0: &str, args: &str) {
-    try_to_run_in::call(context, USE_CWD, argv0, args)?;
+    try_to_run_in::call(context, &USE_CWD, argv0, args)?;
 }
 
 /// Run the given command in the given subpath of the data directory
@@ -256,7 +258,7 @@ pub fn try_to_run(context: &ScenarioContext, argv0: &str, args: &str) {
 #[step]
 #[context(Datadir)]
 #[context(Runcmd)]
-pub fn try_to_run_in(context: &ScenarioContext, dirname: &str, argv0: &str, args: &str) {
+pub fn try_to_run_in(context: &ScenarioContext, dirname: &Path, argv0: &str, args: &str) {
     // This is the core of runcmd and is how we handle things
     let argv0: PathBuf = if argv0.starts_with('.') {
         context.with(
@@ -270,7 +272,7 @@ pub fn try_to_run_in(context: &ScenarioContext, dirname: &str, argv0: &str, args
         |datadir: &Datadir| Ok(datadir.base_path().to_path_buf()),
         false,
     )?;
-    if dirname != USE_CWD {
+    if dirname != USE_CWD.as_path() {
         datadir = datadir.join(dirname);
     }
     let mut proc = Command::new(&argv0);
@@ -351,7 +353,7 @@ pub fn exit_code_is(context: &Runcmd, exit: i32) {
 #[step]
 pub fn exit_code_is_not(context: &Runcmd, exit: i32) {
     if context.exitcode.is_none() || context.exitcode == Some(exit) {
-        throw!(format!("Expected exit code to not equal {}", exit));
+        throw!(format!("Expected exit code to not equal {exit}"));
     }
 }
 
@@ -420,7 +422,7 @@ fn check_matches(runcmd: &Runcmd, which: Stream, how: MatchKind, against: &str)
 #[step]
 pub fn stdout_is(runcmd: &Runcmd, text: &str) {
     if !check_matches(runcmd, Stream::Stdout, MatchKind::Exact, text)? {
-        throw!(format!("stdout is not {:?}", text));
+        throw!(format!("stdout is not {text:?}"));
     }
 }
 
@@ -433,7 +435,7 @@ pub fn stdout_is(runcmd: &Runcmd, text: &str) {
 #[step]
 pub fn stdout_isnt(runcmd: &Runcmd, text: &str) {
     if check_matches(runcmd, Stream::Stdout, MatchKind::Exact, text)? {
-        throw!(format!("stdout is exactly {:?}", text));
+        throw!(format!("stdout is exactly {text:?}"));
     }
 }
 
@@ -446,7 +448,7 @@ pub fn stdout_isnt(runcmd: &Runcmd, text: &str) {
 #[step]
 pub fn stderr_is(runcmd: &Runcmd, text: &str) {
     if !check_matches(runcmd, Stream::Stderr, MatchKind::Exact, text)? {
-        throw!(format!("stderr is not {:?}", text));
+        throw!(format!("stderr is not {text:?}"));
     }
 }
 
@@ -459,7 +461,7 @@ pub fn stderr_is(runcmd: &Runcmd, text: &str) {
 #[step]
 pub fn stderr_isnt(runcmd: &Runcmd, text: &str) {
     if check_matches(runcmd, Stream::Stderr, MatchKind::Exact, text)? {
-        throw!(format!("stderr is exactly {:?}", text));
+        throw!(format!("stderr is exactly {text:?}"));
     }
 }
 
@@ -472,7 +474,7 @@ pub fn stderr_isnt(runcmd: &Runcmd, text: &str) {
 #[step]
 pub fn stdout_contains(runcmd: &Runcmd, text: &str) {
     if !check_matches(runcmd, Stream::Stdout, MatchKind::Contains, text)? {
-        throw!(format!("stdout does not contain {:?}", text));
+        throw!(format!("stdout does not contain {text:?}"));
     }
 }
 
@@ -485,7 +487,7 @@ pub fn stdout_contains(runcmd: &Runcmd, text: &str) {
 #[step]
 pub fn stdout_doesnt_contain(runcmd: &Runcmd, text: &str) {
     if check_matches(runcmd, Stream::Stdout, MatchKind::Contains, text)? {
-        throw!(format!("stdout contains {:?}", text));
+        throw!(format!("stdout contains {text:?}"));
     }
 }
 
@@ -498,7 +500,7 @@ pub fn stdout_doesnt_contain(runcmd: &Runcmd, text: &str) {
 #[step]
 pub fn stderr_contains(runcmd: &Runcmd, text: &str) {
     if !check_matches(runcmd, Stream::Stderr, MatchKind::Contains, text)? {
-        throw!(format!("stderr does not contain {:?}", text));
+        throw!(format!("stderr does not contain {text:?}"));
     }
 }
 
@@ -511,7 +513,7 @@ pub fn stderr_contains(runcmd: &Runcmd, text: &str) {
 #[step]
 pub fn stderr_doesnt_contain(runcmd: &Runcmd, text: &str) {
     if check_matches(runcmd, Stream::Stderr, MatchKind::Contains, text)? {
-        throw!(format!("stderr contains {:?}", text));
+        throw!(format!("stderr contains {text:?}"));
     }
 }
 
@@ -525,7 +527,7 @@ pub fn stderr_doesnt_contain(runcmd: &Runcmd, text: &str) {
 #[step]
 pub fn stdout_matches_regex(runcmd: &Runcmd, regex: &str) {
     if !check_matches(runcmd, Stream::Stdout, MatchKind::Regex, regex)? {
-        throw!(format!("stdout does not match {:?}", regex));
+        throw!(format!("stdout does not match {regex:?}"));
     }
 }
 
@@ -539,7 +541,7 @@ pub fn stdout_matches_regex(runcmd: &Runcmd, regex: &str) {
 #[step]
 pub fn stdout_doesnt_match_regex(runcmd: &Runcmd, regex: &str) {
     if check_matches(runcmd, Stream::Stdout, MatchKind::Regex, regex)? {
-        throw!(format!("stdout matches {:?}", regex));
+        throw!(format!("stdout matches {regex:?}"));
     }
 }
 
@@ -553,7 +555,7 @@ pub fn stdout_doesnt_match_regex(runcmd: &Runcmd, regex: &str) {
 #[step]
 pub fn stderr_matches_regex(runcmd: &Runcmd, regex: &str) {
     if !check_matches(runcmd, Stream::Stderr, MatchKind::Regex, regex)? {
-        throw!(format!("stderr does not match {:?}", regex));
+        throw!(format!("stderr does not match {regex:?}"));
     }
 }
 
@@ -567,6 +569,6 @@ pub fn stderr_matches_regex(runcmd: &Runcmd, regex: &str) {
 #[step]
 pub fn stderr_doesnt_match_regex(runcmd: &Runcmd, regex: &str) {
     if check_matches(runcmd, Stream::Stderr, MatchKind::Regex, regex)? {
-        throw!(format!("stderr matches {:?}", regex));
+        throw!(format!("stderr matches {regex:?}"));
     }
 }