Dedicated error for for_cwd() failures

Author: jwodder

CHANGELOG.md

@@ -13,6 +13,8 @@ v0.3.0 (in development)
   separate the hostname from the path with a slash rather than a colon)
 - Schemes & hostnames in URLs are now parsed case-insensitively
 - Switch from clap to lexopt
+- `LocalRepo::for_cwd()` now returns a new dedicated variant of
+  `LocalRepoError` if the call to `std::env::current_dir()` fails
 
 v0.2.1 (2022-10-19)
 -------------------

src/lib.rs

@@ -306,10 +306,10 @@ impl LocalRepo {
     ///
     /// # Errors
     ///
-    /// Returns failures from [`std::env::current_dir()`]
-    pub fn for_cwd() -> Result<Self, io::Error> {
+    /// Returns a [`LocalRepoError`] if [`std::env::current_dir()`] failed
+    pub fn for_cwd() -> Result<Self, LocalRepoError> {
         Ok(LocalRepo {
-            path: env::current_dir()?,
+            path: env::current_dir().map_err(LocalRepoError::CurdirError)?,
         })
     }
 
@@ -331,7 +331,8 @@ impl LocalRepo {
             .stdout(Stdio::null())
             .stderr(Stdio::null())
             .current_dir(&self.path)
-            .status()?
+            .status()
+            .map_err(LocalRepoError::CouldNotExecute)?
             .success())
     }
 
@@ -342,7 +343,8 @@ impl LocalRepo {
             .args(args)
             .current_dir(&self.path)
             .stderr(Stdio::inherit())
-            .output()?;
+            .output()
+            .map_err(LocalRepoError::CouldNotExecute)?;
         if out.status.success() {
             Ok(str::from_utf8(&out.stdout)?.trim().to_string())
         } else {
@@ -414,6 +416,10 @@ pub enum LocalRepoError {
     /// Returned when the Git command returned nonzero
     CommandFailed(ExitStatus),
 
+    /// Returned by [`LocalRepo::for_cwd()`] if [`std::env::current_dir()`]
+    /// errored
+    CurdirError(io::Error),
+
     /// Returned by [`LocalRepo::current_branch()`] if the repository is in a
     /// detached `HEAD` state
     DetachedHead,
@@ -444,6 +450,9 @@ impl fmt::Display for LocalRepoError {
             LocalRepoError::CommandFailed(r) => {
                 write!(f, "Git command exited unsuccessfully: {}", r)
             }
+            LocalRepoError::CurdirError(e) => {
+                write!(f, "Could not determine current directory: {}", e)
+            }
             LocalRepoError::DetachedHead => {
                 write!(f, "Git repository is in a detached HEAD state")
             }
@@ -472,6 +481,7 @@ impl error::Error for LocalRepoError {
         match self {
             LocalRepoError::CouldNotExecute(e) => Some(e),
             LocalRepoError::CommandFailed(_) => None,
+            LocalRepoError::CurdirError(e) => Some(e),
             LocalRepoError::DetachedHead => None,
             LocalRepoError::NoSuchRemote(_) => None,
             LocalRepoError::NoUpstream(_) => None,
@@ -481,12 +491,6 @@ impl error::Error for LocalRepoError {
     }
 }
 
-impl From<io::Error> for LocalRepoError {
-    fn from(e: io::Error) -> LocalRepoError {
-        LocalRepoError::CouldNotExecute(e)
-    }
-}
-
 impl From<str::Utf8Error> for LocalRepoError {
     fn from(e: str::Utf8Error) -> LocalRepoError {
         LocalRepoError::InvalidUtf8(e)

tests/errors.rs

@@ -34,6 +34,18 @@ fn test_display_local_repo_error_could_not_execute() {
     );
 }
 
+#[test]
+fn test_display_local_repo_error_curdir() {
+    let e = LocalRepoError::CurdirError(Error::from(ErrorKind::NotFound));
+    assert_eq!(
+        e.to_string(),
+        format!(
+            "Could not determine current directory: {}",
+            Error::from(ErrorKind::NotFound)
+        )
+    );
+}
+
 #[test]
 fn test_display_local_repo_error_detached_head() {
     let e = LocalRepoError::DetachedHead;