Handle errors when checking for files (#3051)

Author: casey

src/compiler.rs

@@ -79,7 +79,7 @@ impl Compiler {
               .join(Self::expand_tilde(&relative.cooked)?)
               .lexiclean();
 
-            if import.is_file() {
+            if filesystem::is_file(&import)? {
               if current.file_path.contains(&import) {
                 return Err(Error::CircularImport {
                   current: current.path,
@@ -121,7 +121,7 @@ impl Compiler {
     if let Some(path) = path {
       let full = parent.join(path);
 
-      if full.is_file() {
+      if filesystem::is_file(&full)? {
         return Ok(Some(full));
       }
 

src/error.rs

@@ -104,6 +104,10 @@ pub(crate) enum Error<'src> {
   ExpectedSubmoduleButFoundRecipe {
     path: String,
   },
+  FilesystemIo {
+    io_error: io::Error,
+    path: PathBuf,
+  },
   FlagWithValue {
     recipe: &'src str,
     option: Switch,
@@ -551,6 +555,9 @@ impl ColorDisplay for Error<'_> {
       ExpectedSubmoduleButFoundRecipe { path } => {
         write!(f, "Expected submodule at `{path}` but found recipe.")?;
       }
+      FilesystemIo { io_error, path } => {
+        write!(f, "I/O error at `{}`: {io_error}", path.display())?;
+      }
       FlagWithValue { recipe, option } => {
         write!(f, "Recipe `{recipe}` flag `{option}` does not take value",)?;
       }

src/filesystem.rs

@@ -0,0 +1,17 @@
+use super::*;
+
+pub(crate) fn is_file(path: &Path) -> RunResult<'static, bool> {
+  match path.metadata() {
+    Ok(metadata) => Ok(metadata.is_file()),
+    Err(io_error) => {
+      if io_error.kind() == io::ErrorKind::NotFound {
+        Ok(false)
+      } else {
+        Err(Error::FilesystemIo {
+          path: path.into(),
+          io_error,
+        })
+      }
+    }
+  }
+}

src/lib.rs

@@ -224,6 +224,7 @@ mod evaluator;
 mod execution_context;
 mod executor;
 mod expression;
+mod filesystem;
 mod format_string_part;
 mod fragment;
 mod function;

src/load_dotenv.rs

@@ -26,7 +26,7 @@ pub(crate) fn load_dotenv(
 
   if let Some(path) = dotenv_path {
     let path = working_directory.join(path);
-    if path.is_file() {
+    if filesystem::is_file(&path)? {
       return load_from_file(&path, settings);
     }
   }
@@ -35,7 +35,7 @@ pub(crate) fn load_dotenv(
 
   for directory in working_directory.ancestors() {
     let path = directory.join(filename);
-    if path.is_file() {
+    if filesystem::is_file(&path)? {
       return load_from_file(&path, settings);
     }
   }

src/subcommand.rs

@@ -380,7 +380,7 @@ impl Subcommand {
       config.ceiling.as_deref(),
     )?;
 
-    if search.justfile.is_file() {
+    if filesystem::is_file(&search.justfile)? {
       return Err(Error::InitExists {
         justfile: search.justfile,
       });