Merge #74

74: v0.2.4 r=matklad a=matklad

bors r+

Co-authored-by: Alex Kladov <aleksey.kladov@gmail.com>

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.4
+
+- Improve error message when a working directory for `cmd!` does not exist.
+
 ## 0.2.3
 
 - Fix bug where `Cmd::run` would ignore specified stdin.

Cargo.toml

@@ -2,7 +2,7 @@
 name = "xshell"
 description = "Utilities for quick shell scripting in Rust"
 categories = ["development-tools::build-utils", "filesystem"]
-version = "0.2.3" # also update xshell-macros/Cargo.toml and CHANGELOG.md
+version = "0.2.4" # also update xshell-macros/Cargo.toml and CHANGELOG.md
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/matklad/xshell"
 authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"]
@@ -14,7 +14,7 @@ exclude = [".github/", "bors.toml", "rustfmt.toml", "cbench", "mock_bin/"]
 [workspace]
 
 [dependencies]
-xshell-macros = { version = "=0.2.3", path = "./xshell-macros" }
+xshell-macros = { version = "=0.2.4", path = "./xshell-macros" }
 
 [dev-dependencies]
 anyhow = "1.0.56"

tests/it/main.rs

@@ -466,12 +466,14 @@ fn nonexistent_current_directory() {
     let sh = setup();
     sh.change_dir("nonexistent");
     let err = cmd!(sh, "ls").run().unwrap_err();
+    let message = err.to_string();
     if cfg!(unix) {
-        assert!(err.to_string().starts_with("failed to get current directory"));
-        assert!(err.to_string().ends_with("No such file or directory (os error 2)"));
+        assert!(message.contains("nonexistent"), "{message}");
+        assert!(message.starts_with("failed to get current directory"));
+        assert!(message.ends_with("No such file or directory (os error 2)"));
     } else {
         assert_eq!(
-            err.to_string(),
+            message,
             "io error when running command `ls`: The directory name is invalid. (os error 267)"
         );
     }

xshell-macros/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "xshell-macros"
 description = "Private implementation detail of xshell crate"
-version = "0.2.3"
+version = "0.2.4"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/matklad/xshell"
 authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"]