1 files changed, 27 insertions, 8 deletions

diff --git a/src/error.rs b/src/error.rs
index 6d7aba4..9252762 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -2,25 +2,27 @@ use std::error::Error;
 use std::fmt::Display;
 use std::io;
 
-pub type ArchiveResult<R, E> = Result<R, ArchiveError<E>>;
+pub type ArchiveResult<T, E> = Result<T, ArchiveError<E>>;
 
 #[derive(Debug)]
 pub enum ArchiveError<E: Error> {
-    IO(io::Error),
-    Driver { name: &'static str, error: E },
+    IO { error: io::Error },
+    Serde { message: String },
+    Archivator { module: String, error: E },
 }
 
 impl<E: Error> From<io::Error> for ArchiveError<E> {
     fn from(value: io::Error) -> Self {
-        Self::IO(value)
+        Self::IO { error: value }
     }
 }
 
 impl<E: Error> Display for ArchiveError<E> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            ArchiveError::IO(error) => write!(f, "{error}"),
-            ArchiveError::Driver { name, error } => write!(f, "{name}: {error}"),
+            Self::IO { error } => writeln!(f, "IO: {error}"),
+            Self::Serde { message } => writeln!(f, "Serde: {message}"),
+            Self::Archivator { module, error } => writeln!(f, "{module}: {error}"),
         }
     }
 }
@@ -28,8 +30,25 @@ impl<E: Error> Display for ArchiveError<E> {
 impl<E: Error> Error for ArchiveError<E> {
     fn source(&self) -> Option<&(dyn Error + 'static)> {
         match self {
-            Self::IO(error) => Some(error),
-            _ => None,
+            Self::IO { error } => Some(error),
+            Self::Serde { .. } => None,
+            Self::Archivator { module, error } => None,
+        }
+    }
+}
+
+impl<E: Error> serde::ser::Error for ArchiveError<E> {
+    fn custom<T: Display>(msg: T) -> Self {
+        Self::Serde {
+            message: msg.to_string(),
+        }
+    }
+}
+
+impl<E: Error> serde::de::Error for ArchiveError<E> {
+    fn custom<T: Display>(msg: T) -> Self {
+        Self::Serde {
+            message: msg.to_string(),
         }
     }
 }