Improve errors some more

Signed-off-by: Alex Saveau <[email protected]>

cpz/src/main.rs

@@ -50,11 +50,11 @@ fn main() -> error_stack::Result<(), CliError> {
             Error::Io { error, context } => Report::from(error)
                 .attach_printable(context)
                 .change_context(wrapper),
-            Error::PreserveRoot
-            | Error::Join
-            | Error::BadPath
-            | Error::AlreadyExists
-            | Error::Internal => Report::from(wrapper),
+            Error::AlreadyExists { file: _ } => {
+                Report::from(wrapper).attach_printable("Use --force to overwrite.")
+            }
+            Error::Join | Error::BadPath | Error::Internal => Report::from(wrapper),
+            Error::PreserveRoot => unreachable!(),
         }
     })
 }

fuc_engine/api.golden

@@ -1,6 +1,7 @@
 pub mod fuc_engine
 pub enum fuc_engine::Error
 pub fuc_engine::Error::AlreadyExists
+pub fuc_engine::Error::AlreadyExists::file: std::path::PathBuf
 pub fuc_engine::Error::BadPath
 pub fuc_engine::Error::Internal
 pub fuc_engine::Error::Io

fuc_engine/src/lib.rs

@@ -4,7 +4,7 @@
 #![feature(once_cell)]
 #![allow(clippy::module_name_repetitions)]
 
-use std::io;
+use std::{io, path::PathBuf};
 
 use thiserror::Error;
 
@@ -14,16 +14,16 @@ mod ops;
 
 #[derive(Error, Debug)]
 pub enum Error {
-    #[error("An IO error occurred.")]
+    #[error("An I/O error occurred")]
     Io { error: io::Error, context: String },
-    #[error("An attempt was made to delete `/`.")]
+    #[error("An attempt was made to delete `/`")]
     PreserveRoot,
-    #[error("Failed to join thread.")]
+    #[error("Failed to join thread")]
     Join,
-    #[error("Invalid file path.")]
+    #[error("Invalid file path")]
     BadPath,
-    #[error("File or directory already exists.")]
-    AlreadyExists,
-    #[error("An internal bug occurred, please report this.")]
+    #[error("File or directory already exists: {file:?}")]
+    AlreadyExists { file: PathBuf },
+    #[error("An internal bug occurred, please report this")]
     Internal,
 }

fuc_engine/src/ops/copy.rs

@@ -46,7 +46,11 @@ fn schedule_copies<'a>(
     for (from, to) in files {
         if !force {
             match to.metadata() {
-                Ok(_) => return Err(Error::AlreadyExists),
+                Ok(_) => {
+                    return Err(Error::AlreadyExists {
+                        file: to.into_owned(),
+                    });
+                }
                 Err(e) if e.kind() == io::ErrorKind::NotFound => {
                     // Do nothing, this is good
                 }

rmz/src/main.rs

@@ -56,11 +56,10 @@ fn main() -> Result<(), CliError> {
                 Error::Io { error, context } => Report::from(error)
                     .attach_printable(context)
                     .change_context(wrapper),
-                Error::PreserveRoot
-                | Error::Join
-                | Error::BadPath
-                | Error::AlreadyExists
-                | Error::Internal => Report::from(wrapper),
+                Error::PreserveRoot | Error::Join | Error::BadPath | Error::Internal => {
+                    Report::from(wrapper)
+                }
+                Error::AlreadyExists { file: _ } => unreachable!(),
             }
         })
 }