13 files changed, 37 insertions, 37 deletions
diff --git a/src/primitive/bufferid.rs b/src/primitive/bufferid.rs
index 1735473..844dd37 100644
--- a/src/primitive/bufferid.rs
+++ b/src/primitive/bufferid.rs
@@ -2,7 +2,7 @@
 #[repr(transparent)]
 pub struct BufferId(pub i32);
 
-use crate::{deserialize::*, error::ProtocolError, serialize::*};
+use crate::{error::ProtocolError, serialize::*};
 
 use crate::serialize::UserType;
 
diff --git a/src/primitive/bufferinfo.rs b/src/primitive/bufferinfo.rs
index f2f13bf..56d5cce 100644
--- a/src/primitive/bufferinfo.rs
+++ b/src/primitive/bufferinfo.rs
@@ -1,7 +1,7 @@
 use std::vec::Vec;
 
 use crate::primitive::BufferId;
-use crate::{deserialize::*, error::ProtocolError, serialize::*};
+use crate::{error::ProtocolError, serialize::*};
 
 use crate::serialize::UserType;
 
diff --git a/src/primitive/datetime.rs b/src/primitive/datetime.rs
index 2159af3..42f6d14 100644
--- a/src/primitive/datetime.rs
+++ b/src/primitive/datetime.rs
@@ -1,4 +1,4 @@
-use crate::{deserialize::*, error::ProtocolError, primitive, serialize::*};
+use crate::{error::ProtocolError, primitive, serialize::*};
 
 use time::{OffsetDateTime, PrimitiveDateTime, UtcOffset};
 
@@ -18,7 +18,7 @@ use time::{OffsetDateTime, PrimitiveDateTime, UtcOffset};
 pub type DateTime = OffsetDateTime;
 pub use time::{Date, Time};
 
-use crate::serialize::SerializeVariant;
+use crate::serialize::VariantType;
 
 /// TimeSpec specifies whether the time is a local time, daylightsaving local time or a form of UTC Offset
 #[repr(i8)]
@@ -113,7 +113,7 @@ impl Deserialize for OffsetDateTime {
     }
 }
 
-impl SerializeVariant for OffsetDateTime {
+impl VariantType for OffsetDateTime {
     const TYPE: u32 = primitive::QDATETIME;
 }
 
@@ -136,7 +136,7 @@ impl Deserialize for Date {
     }
 }
 
-impl SerializeVariant for Date {
+impl VariantType for Date {
     const TYPE: u32 = primitive::QDATE;
 }
 
@@ -174,7 +174,7 @@ impl Deserialize for Time {
     }
 }
 
-impl SerializeVariant for Time {
+impl VariantType for Time {
     const TYPE: u32 = primitive::QTIME;
 }
 
diff --git a/src/primitive/message.rs b/src/primitive/message.rs
index bac3899..624ff49 100644
--- a/src/primitive/message.rs
+++ b/src/primitive/message.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashMap, vec::Vec};
 
 use crate::error::ProtocolError;
-use crate::{deserialize::*, serialize::*};
+use crate::serialize::*;
 
 use crate::primitive::{BufferInfo, MsgId};
 
diff --git a/src/primitive/msgid.rs b/src/primitive/msgid.rs
index 7f3e32f..9ae8d9c 100644
--- a/src/primitive/msgid.rs
+++ b/src/primitive/msgid.rs
@@ -6,7 +6,7 @@ pub struct MsgId(
 );
 
 use crate::error::ProtocolError;
-use crate::{deserialize::*, serialize::*};
+use crate::serialize::*;
 
 use crate::serialize::UserType;
 
diff --git a/src/primitive/peerptr.rs b/src/primitive/peerptr.rs
index f2a3e05..499be41 100644
--- a/src/primitive/peerptr.rs
+++ b/src/primitive/peerptr.rs
@@ -1,5 +1,5 @@
 use crate::{
-    deserialize::Deserialize,
+    serialize::Deserialize,
     serialize::{Serialize, SerializeUTF8},
 };
 
diff --git a/src/primitive/signedint.rs b/src/primitive/signedint.rs
index d8361a3..6bf009f 100644
--- a/src/primitive/signedint.rs
+++ b/src/primitive/signedint.rs
@@ -4,9 +4,9 @@ use std::io::Cursor;
 use std::result::Result;
 use std::vec::Vec;
 
-use crate::{deserialize::*, error::ProtocolError, primitive, serialize::*};
+use crate::{error::ProtocolError, primitive, serialize::*};
 
-use crate::serialize::SerializeVariant;
+use crate::serialize::VariantType;
 
 impl Serialize for i64 {
     fn serialize(&self) -> Result<Vec<u8>, ProtocolError> {
@@ -21,7 +21,7 @@ impl Deserialize for i64 {
     }
 }
 
-impl SerializeVariant for i64 {
+impl VariantType for i64 {
     const TYPE: u32 = primitive::LONG;
 }
 
@@ -38,7 +38,7 @@ impl Deserialize for i32 {
     }
 }
 
-impl SerializeVariant for i32 {
+impl VariantType for i32 {
     const TYPE: u32 = primitive::INT;
 }
 
@@ -55,7 +55,7 @@ impl Deserialize for i16 {
     }
 }
 
-impl SerializeVariant for i16 {
+impl VariantType for i16 {
     const TYPE: u32 = primitive::SHORT;
 }
 
@@ -72,6 +72,6 @@ impl Deserialize for i8 {
     }
 }
 
-impl SerializeVariant for i8 {
+impl VariantType for i8 {
     const TYPE: u32 = primitive::CHAR;
 }
diff --git a/src/primitive/string.rs b/src/primitive/string.rs
index 1d6f0af..7f8ec58 100644
--- a/src/primitive/string.rs
+++ b/src/primitive/string.rs
@@ -5,9 +5,9 @@ use std::vec::Vec;
 
 use log::trace;
 
-use crate::{deserialize::*, error::ProtocolError, primitive, serialize::*, util};
+use crate::{error::ProtocolError, primitive, serialize::*, util};
 
-use crate::serialize::SerializeVariant;
+use crate::serialize::VariantType;
 
 impl Deserialize for char {
     fn parse(b: &[u8]) -> Result<(usize, Self), ProtocolError> {
@@ -27,7 +27,7 @@ impl Serialize for char {
     }
 }
 
-impl SerializeVariant for char {
+impl VariantType for char {
     const TYPE: u32 = crate::primitive::QCHAR;
 }
 
@@ -46,7 +46,7 @@ impl SerializeUTF8 for String {
     }
 }
 
-impl SerializeVariant for String {
+impl VariantType for String {
     const TYPE: u32 = primitive::QSTRING;
 }
 
diff --git a/src/primitive/stringlist.rs b/src/primitive/stringlist.rs
index f76e95d..292557f 100644
--- a/src/primitive/stringlist.rs
+++ b/src/primitive/stringlist.rs
@@ -5,9 +5,9 @@ use std::vec::Vec;
 
 use log::trace;
 
-use crate::{deserialize::*, error::ProtocolError, serialize::*};
+use crate::{error::ProtocolError, serialize::*};
 
-use crate::serialize::SerializeVariant;
+use crate::serialize::VariantType;
 
 /// StringList are represented as a Vec of Strings
 ///
@@ -47,7 +47,7 @@ impl Deserialize for StringList {
     }
 }
 
-impl SerializeVariant for StringList {
+impl VariantType for StringList {
     const TYPE: u32 = crate::primitive::QSTRINGLIST;
 }
 
diff --git a/src/primitive/unsignedint.rs b/src/primitive/unsignedint.rs
index f0a78f7..a51ca6f 100644
--- a/src/primitive/unsignedint.rs
+++ b/src/primitive/unsignedint.rs
@@ -6,9 +6,9 @@ use std::result::Result;
 use std::vec::Vec;
 
 use crate::error::ProtocolError;
-use crate::{deserialize::*, primitive, serialize::*};
+use crate::{primitive, serialize::*};
 
-use crate::serialize::SerializeVariant;
+use crate::serialize::VariantType;
 
 impl Serialize for bool {
     fn serialize(&self) -> Result<Vec<u8>, ProtocolError> {
@@ -31,7 +31,7 @@ impl Deserialize for bool {
     }
 }
 
-impl SerializeVariant for bool {
+impl VariantType for bool {
     const TYPE: u32 = primitive::BOOL;
 }
 
@@ -48,7 +48,7 @@ impl Deserialize for u64 {
     }
 }
 
-impl SerializeVariant for u64 {
+impl VariantType for u64 {
     const TYPE: u32 = primitive::ULONG;
 }
 
@@ -65,7 +65,7 @@ impl Deserialize for u32 {
     }
 }
 
-impl SerializeVariant for u32 {
+impl VariantType for u32 {
     const TYPE: u32 = primitive::UINT;
 }
 
@@ -82,7 +82,7 @@ impl Deserialize for u16 {
     }
 }
 
-impl SerializeVariant for u16 {
+impl VariantType for u16 {
     const TYPE: u32 = primitive::USHORT;
 }
 
@@ -98,6 +98,6 @@ impl Deserialize for u8 {
     }
 }
 
-impl SerializeVariant for u8 {
+impl VariantType for u8 {
     const TYPE: u32 = primitive::UCHAR;
 }
diff --git a/src/primitive/variant.rs b/src/primitive/variant.rs
index 3678ca7..32757d9 100644
--- a/src/primitive/variant.rs
+++ b/src/primitive/variant.rs
@@ -6,7 +6,7 @@ use log::{error, trace};
 use crate::error::ProtocolError;
 use crate::primitive::StringList;
 use crate::primitive::{self, PeerPtr};
-use crate::{deserialize::*, serialize::*};
+use crate::serialize::*;
 
 use crate::primitive::{BufferId, BufferInfo, Date, DateTime, Message, MsgId, Time, VariantList, VariantMap};
 
diff --git a/src/primitive/variantlist.rs b/src/primitive/variantlist.rs
index ac8cc07..0f0f4e0 100644
--- a/src/primitive/variantlist.rs
+++ b/src/primitive/variantlist.rs
@@ -3,11 +3,11 @@ use std::vec::Vec;
 use log::trace;
 
 use crate::error::ProtocolError;
-use crate::{deserialize::*, serialize::*};
+use crate::serialize::*;
 
 use crate::primitive::Variant;
 
-use crate::serialize::SerializeVariant;
+use crate::serialize::VariantType;
 
 /// VariantLists are represented as a Vec of Variants.
 ///
@@ -47,7 +47,7 @@ impl Deserialize for VariantList {
     }
 }
 
-impl SerializeVariant for VariantList {
+impl VariantType for VariantList {
     const TYPE: u32 = crate::primitive::QVARIANTLIST;
 }
 
diff --git a/src/primitive/variantmap.rs b/src/primitive/variantmap.rs
index 7a847c5..4953f25 100644
--- a/src/primitive/variantmap.rs
+++ b/src/primitive/variantmap.rs
@@ -4,12 +4,12 @@ use std::vec::Vec;
 use log::trace;
 
 use crate::error::ProtocolError;
-use crate::{deserialize::*, serialize::*};
+use crate::serialize::*;
 
 use crate::primitive::Variant;
 use crate::util;
 
-use crate::serialize::SerializeVariant;
+use crate::serialize::VariantType;
 
 /// VariantMaps are represented as a HashMap with String as key and Variant as value
 ///
@@ -55,6 +55,6 @@ impl Deserialize for VariantMap {
     }
 }
 
-impl SerializeVariant for VariantMap {
+impl VariantType for VariantMap {
     const TYPE: u32 = crate::primitive::QVARIANTMAP;
 }