Partial aes implementation and others improvements

1 files changed, 23 insertions, 18 deletions

diff --git a/src/structs/error.rs b/src/structs/error.rs
index f07163c..deb10b3 100644
--- a/src/structs/error.rs
+++ b/src/structs/error.rs
@@ -1,37 +1,42 @@
-use crate::{ArchiveError, ArchiveResult};
+use serde::{de, ser};
 use std::error::Error;
 use std::fmt::Display;
 
-pub type StructResult<T> = ArchiveResult<T, StructError>;
+pub type StructResult<T> = Result<T, StructError>;
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum StructError {
-    SerializationNotSupported { type_name: &'static str },
-    DeserializationNotSupported { type_name: &'static str },
+    SerializationNotSupported(&'static str),
+    DeserializationNotSupported(&'static str),
+    Serde(String),
     UnexpectedEOF,
 }
 
-impl From<StructError> for ArchiveError<StructError> {
-    fn from(value: StructError) -> Self {
-        Self::Archivator {
-            module: "Struct serializer",
-            error: value,
-        }
-    }
-}
-
 impl Display for StructError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::SerializationNotSupported { type_name } => {
-                writeln!(f, "Serialization for type '{type_name}' not supported")
+            Self::SerializationNotSupported(name) => {
+                writeln!(f, "Serialization for type '{}' not supported", name)
             }
-            Self::DeserializationNotSupported { type_name } => {
-                writeln!(f, "Deserialization for type '{type_name}' not supported")
+            Self::DeserializationNotSupported(name) => {
+                writeln!(f, "Deserialization for type '{}' not supported", name)
             }
+            Self::Serde(message) => writeln!(f, "Serde error: {}", message),
             Self::UnexpectedEOF => writeln!(f, "Unexpected EOF"),
         }
     }
 }
 
 impl Error for StructError {}
+
+impl ser::Error for StructError {
+    fn custom<T: Display>(msg: T) -> Self {
+        Self::Serde(msg.to_string())
+    }
+}
+
+impl de::Error for StructError {
+    fn custom<T: Display>(msg: T) -> Self {
+        Self::Serde(msg.to_string())
+    }
+}