From b8ad94cd5061445a45d0790eee36014d34ad6817 Mon Sep 17 00:00:00 2001 From: Max Audron Date: Sat, 22 Feb 2025 22:59:01 +0100 Subject: replace deprecated failure crate with thiserror this changes the public API in that all our methods now return a proper ProtocolError crate. Needed change anyways to properly deal with all our errors in the long run. Will still need to do a pass through the crate to remove all existing unwraps where it makes sense. --- src/primitive/datetime.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/primitive/datetime.rs') diff --git a/src/primitive/datetime.rs b/src/primitive/datetime.rs index 395830d..303716a 100644 --- a/src/primitive/datetime.rs +++ b/src/primitive/datetime.rs @@ -1,4 +1,4 @@ -use crate::{deserialize::*, serialize::*}; +use crate::{deserialize::*, error::ProtocolError, serialize::*}; use time::{OffsetDateTime, PrimitiveDateTime, UtcOffset}; @@ -43,7 +43,7 @@ impl From for TimeSpec { } impl Serialize for OffsetDateTime { - fn serialize(&self) -> Result, failure::Error> { + fn serialize(&self) -> Result, ProtocolError> { let mut values: Vec = Vec::new(); values.extend(i32::serialize(&(self.date().to_julian_day() as i32))?); @@ -66,7 +66,7 @@ impl Serialize for OffsetDateTime { } impl Deserialize for OffsetDateTime { - fn parse(b: &[u8]) -> Result<(usize, Self), failure::Error> { + fn parse(b: &[u8]) -> Result<(usize, Self), ProtocolError> { let (_, julian_day) = i32::parse(&b[0..4])?; let (_, millis_of_day) = i32::parse(&b[4..8])?; let (_, zone) = u8::parse(&b[8..9])?; @@ -112,7 +112,7 @@ impl Deserialize for OffsetDateTime { } impl Serialize for Date { - fn serialize(&self) -> Result, failure::Error> { + fn serialize(&self) -> Result, ProtocolError> { let mut values: Vec = Vec::new(); values.extend(i32::serialize(&(self.to_julian_day() as i32))?); @@ -122,7 +122,7 @@ impl Serialize for Date { } impl Deserialize for Date { - fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), failure::Error> { + fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), ProtocolError> { let (_, julian_day) = i32::parse(&b[0..4])?; let date = Date::from_julian_day(julian_day)?; @@ -131,7 +131,7 @@ impl Deserialize for Date { } impl Serialize for Time { - fn serialize(&self) -> Result, failure::Error> { + fn serialize(&self) -> Result, ProtocolError> { let mut values: Vec = Vec::new(); let time: i32 = { @@ -150,7 +150,7 @@ impl Serialize for Time { } impl Deserialize for Time { - fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), failure::Error> { + fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), ProtocolError> { let (_, millis_of_day) = i32::parse(&b[0..4])?; let hour = millis_of_day / 60 / 60000; -- cgit v1.2.3