From 7bcdc3b4ca460aec2b98fb2dca6165788c562b05 Mon Sep 17 00:00:00 2001
From: Igor Tolmachev <me@igorek.dev>
Date: Sat, 20 Jul 2024 16:52:39 +0900
Subject: Partial aes implementation and others improvements

---
 src/structs/ser.rs | 47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

(limited to 'src/structs/ser.rs')

diff --git a/src/structs/ser.rs b/src/structs/ser.rs
index f7e694a..b633dff 100644
--- a/src/structs/ser.rs
+++ b/src/structs/ser.rs
@@ -1,5 +1,4 @@
 use crate::structs::{Settings, StructError, StructResult};
-use crate::ArchiveError;
 use serde::{ser, Serialize};
 
 pub struct ArchiveSerializer {
@@ -22,7 +21,7 @@ impl ArchiveSerializer {
 
 impl ser::Serializer for &mut ArchiveSerializer {
     type Ok = ();
-    type Error = ArchiveError<StructError>;
+    type Error = StructError;
 
     type SerializeSeq = Self;
     type SerializeTuple = Self;
@@ -89,25 +88,22 @@ impl ser::Serializer for &mut ArchiveSerializer {
 
     #[inline]
     fn serialize_char(self, _v: char) -> StructResult<()> {
-        Err(StructError::SerializationNotSupported { type_name: "char" }.into())
+        Err(StructError::SerializationNotSupported("char"))
     }
 
     #[inline]
     fn serialize_str(self, _v: &str) -> StructResult<()> {
-        Err(StructError::SerializationNotSupported { type_name: "str" }.into())
+        Err(StructError::SerializationNotSupported("str"))
     }
 
     #[inline]
     fn serialize_bytes(self, _v: &[u8]) -> StructResult<()> {
-        Err(StructError::SerializationNotSupported { type_name: "bytes" }.into())
+        Err(StructError::SerializationNotSupported("bytes"))
     }
 
     #[inline]
     fn serialize_none(self) -> StructResult<()> {
-        Err(StructError::SerializationNotSupported {
-            type_name: "optional",
-        }
-        .into())
+        Err(StructError::SerializationNotSupported("optional"))
     }
 
     #[inline]
@@ -115,10 +111,7 @@ impl ser::Serializer for &mut ArchiveSerializer {
     where
         T: ?Sized + Serialize,
     {
-        Err(StructError::SerializationNotSupported {
-            type_name: "optional",
-        }
-        .into())
+        Err(StructError::SerializationNotSupported("optional"))
     }
 
     #[inline]
@@ -175,7 +168,7 @@ impl ser::Serializer for &mut ArchiveSerializer {
 
     #[inline]
     fn serialize_seq(self, _len: Option<usize>) -> StructResult<Self::SerializeSeq> {
-        Err(StructError::SerializationNotSupported { type_name: "seq" }.into())
+        Err(StructError::SerializationNotSupported("seq"))
     }
 
     #[inline]
@@ -210,7 +203,7 @@ impl ser::Serializer for &mut ArchiveSerializer {
 
     #[inline]
     fn serialize_map(self, _len: Option<usize>) -> StructResult<Self::SerializeMap> {
-        Err(StructError::SerializationNotSupported { type_name: "map" }.into())
+        Err(StructError::SerializationNotSupported("map"))
     }
 
     #[inline]
@@ -241,25 +234,25 @@ impl ser::Serializer for &mut ArchiveSerializer {
 
 impl ser::SerializeSeq for &mut ArchiveSerializer {
     type Ok = ();
-    type Error = ArchiveError<StructError>;
+    type Error = StructError;
 
     #[inline]
     fn serialize_element<T>(&mut self, _value: &T) -> StructResult<()>
     where
         T: ?Sized + Serialize,
     {
-        Err(StructError::SerializationNotSupported { type_name: "seq" }.into())
+        Err(StructError::SerializationNotSupported("seq"))
     }
 
     #[inline]
     fn end(self) -> StructResult<()> {
-        Err(StructError::SerializationNotSupported { type_name: "seq" }.into())
+        Err(StructError::SerializationNotSupported("seq"))
     }
 }
 
 impl ser::SerializeTuple for &mut ArchiveSerializer {
     type Ok = ();
-    type Error = ArchiveError<StructError>;
+    type Error = StructError;
 
     #[inline]
     fn serialize_element<T>(&mut self, value: &T) -> StructResult<()>
@@ -277,7 +270,7 @@ impl ser::SerializeTuple for &mut ArchiveSerializer {
 
 impl ser::SerializeTupleStruct for &mut ArchiveSerializer {
     type Ok = ();
-    type Error = ArchiveError<StructError>;
+    type Error = StructError;
 
     #[inline]
     fn serialize_field<T>(&mut self, value: &T) -> StructResult<()>
@@ -295,7 +288,7 @@ impl ser::SerializeTupleStruct for &mut ArchiveSerializer {
 
 impl ser::SerializeTupleVariant for &mut ArchiveSerializer {
     type Ok = ();
-    type Error = ArchiveError<StructError>;
+    type Error = StructError;
 
     #[inline]
     fn serialize_field<T>(&mut self, value: &T) -> StructResult<()>
@@ -313,14 +306,14 @@ impl ser::SerializeTupleVariant for &mut ArchiveSerializer {
 
 impl ser::SerializeMap for &mut ArchiveSerializer {
     type Ok = ();
-    type Error = ArchiveError<StructError>;
+    type Error = StructError;
 
     #[inline]
     fn serialize_key<T>(&mut self, _key: &T) -> StructResult<()>
     where
         T: ?Sized + Serialize,
     {
-        Err(StructError::SerializationNotSupported { type_name: "map" }.into())
+        Err(StructError::SerializationNotSupported("map"))
     }
 
     #[inline]
@@ -328,18 +321,18 @@ impl ser::SerializeMap for &mut ArchiveSerializer {
     where
         T: ?Sized + Serialize,
     {
-        Err(StructError::SerializationNotSupported { type_name: "map" }.into())
+        Err(StructError::SerializationNotSupported("map"))
     }
 
     #[inline]
     fn end(self) -> StructResult<()> {
-        Err(StructError::SerializationNotSupported { type_name: "map" }.into())
+        Err(StructError::SerializationNotSupported("map"))
     }
 }
 
 impl ser::SerializeStruct for &mut ArchiveSerializer {
     type Ok = ();
-    type Error = ArchiveError<StructError>;
+    type Error = StructError;
 
     #[inline]
     fn serialize_field<T>(&mut self, _key: &'static str, value: &T) -> StructResult<()>
@@ -357,7 +350,7 @@ impl ser::SerializeStruct for &mut ArchiveSerializer {
 
 impl ser::SerializeStructVariant for &mut ArchiveSerializer {
     type Ok = ();
-    type Error = ArchiveError<StructError>;
+    type Error = StructError;
 
     #[inline]
     fn serialize_field<T>(&mut self, _key: &'static str, value: &T) -> StructResult<()>
-- 
cgit v1.2.3