From 6f9c0d0f2906d05e27f9f11af6cefdf006c2cf4b Mon Sep 17 00:00:00 2001 From: Max Audron Date: Wed, 26 Feb 2025 17:53:08 +0100 Subject: refactor variant serialization code Factored out a lot of the serialization of variants into trait's that have auto impl so code duplication is much reduced --- src/primitive/datetime.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/primitive/datetime.rs') diff --git a/src/primitive/datetime.rs b/src/primitive/datetime.rs index 303716a..2159af3 100644 --- a/src/primitive/datetime.rs +++ b/src/primitive/datetime.rs @@ -1,4 +1,4 @@ -use crate::{deserialize::*, error::ProtocolError, serialize::*}; +use crate::{deserialize::*, error::ProtocolError, primitive, serialize::*}; use time::{OffsetDateTime, PrimitiveDateTime, UtcOffset}; @@ -18,6 +18,8 @@ use time::{OffsetDateTime, PrimitiveDateTime, UtcOffset}; pub type DateTime = OffsetDateTime; pub use time::{Date, Time}; +use crate::serialize::SerializeVariant; + /// TimeSpec specifies whether the time is a local time, daylightsaving local time or a form of UTC Offset #[repr(i8)] #[derive(Copy, Clone, Debug, std::cmp::PartialEq)] @@ -111,6 +113,10 @@ impl Deserialize for OffsetDateTime { } } +impl SerializeVariant for OffsetDateTime { + const TYPE: u32 = primitive::QDATETIME; +} + impl Serialize for Date { fn serialize(&self) -> Result, ProtocolError> { let mut values: Vec = Vec::new(); @@ -130,6 +136,10 @@ impl Deserialize for Date { } } +impl SerializeVariant for Date { + const TYPE: u32 = primitive::QDATE; +} + impl Serialize for Time { fn serialize(&self) -> Result, ProtocolError> { let mut values: Vec = Vec::new(); @@ -164,6 +174,10 @@ impl Deserialize for Time { } } +impl SerializeVariant for Time { + const TYPE: u32 = primitive::QTIME; +} + #[test] pub fn datetime_serialize() { let datetime = DateTime::parse( -- cgit v1.2.3