Skip to content

Commit

Permalink
inline mod
Browse files Browse the repository at this point in the history
  • Loading branch information
Awpteamoose committed Sep 12, 2024
1 parent 35c1ac5 commit 3ac01e3
Showing 1 changed file with 48 additions and 39 deletions.
87 changes: 48 additions & 39 deletions src/time_delta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,28 +62,6 @@ pub struct TimeDelta {
nanos: i32, // Always 0 <= nanos < NANOS_PER_SEC
}

#[cfg(feature = "serde")]
impl serde::Serialize for TimeDelta {
fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
<(i64, i32) as serde::Serialize>::serialize(&(self.secs, self.nanos), serializer)
}
}

#[cfg(feature = "serde")]
impl<'de> serde::Deserialize<'de> for TimeDelta {
fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
let (secs, nanos) = <(i64, i32) as serde::Deserialize>::deserialize(deserializer)?;
if !(MIN.secs..=MAX.secs).contains(&secs)
|| nanos >= 1_000_000_000
|| (secs == MAX.secs && nanos > MAX.nanos)
|| (secs == MIN.secs && nanos < MIN.nanos)
{
return Err(serde::de::Error::custom("TimeDelta out of bounds"));
}
Ok(TimeDelta { secs, nanos })
}
}

/// The minimum possible `TimeDelta`: `-i64::MAX` milliseconds.
pub(crate) const MIN: TimeDelta = TimeDelta {
secs: -i64::MAX / MILLIS_PER_SEC - 1,
Expand Down Expand Up @@ -660,6 +638,54 @@ impl arbitrary::Arbitrary<'_> for TimeDelta {
}
}

#[cfg(feature = "serde")]
mod serde {
use super::{TimeDelta, MAX, MIN};
use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};

impl Serialize for TimeDelta {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
<(i64, i32) as Serialize>::serialize(&(self.secs, self.nanos), serializer)
}
}

impl<'de> Deserialize<'de> for TimeDelta {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
let (secs, nanos) = <(i64, i32) as Deserialize>::deserialize(deserializer)?;
if !(MIN.secs..=MAX.secs).contains(&secs)
|| nanos >= 1_000_000_000
|| (secs == MAX.secs && nanos > MAX.nanos)
|| (secs == MIN.secs && nanos < MIN.nanos)
{
return Err(Error::custom("TimeDelta out of bounds"));
}
Ok(TimeDelta { secs, nanos })
}
}

#[cfg(test)]
mod tests {
use super::{TimeDelta, MAX};

#[test]
fn test_serde() {
let duration = TimeDelta::new(123, 456).unwrap();
assert_eq!(
serde_json::from_value::<TimeDelta>(serde_json::to_value(duration).unwrap())
.unwrap(),
duration
);
}

#[test]
#[should_panic(expected = "TimeDelta out of bounds")]
fn test_serde_oob_panic() {
let _ =
serde_json::from_value::<TimeDelta>(serde_json::json!([MAX.secs + 1, 0])).unwrap();
}
}
}

#[cfg(test)]
mod tests {
use super::OutOfRangeError;
Expand Down Expand Up @@ -1327,21 +1353,4 @@ mod tests {
let bytes = rkyv::to_bytes::<_, 16>(&duration).unwrap();
assert_eq!(rkyv::from_bytes::<TimeDelta>(&bytes).unwrap(), duration);
}

#[test]
#[cfg(feature = "serde")]
fn test_serde() {
let duration = TimeDelta::new(123, 456).unwrap();
assert_eq!(
serde_json::from_value::<TimeDelta>(serde_json::to_value(duration).unwrap()).unwrap(),
duration
);
}

#[test]
#[cfg(feature = "serde")]
#[should_panic(expected = "TimeDelta out of bounds")]
fn test_serde_oob_panic() {
let _ = serde_json::from_value::<TimeDelta>(serde_json::json!([MAX.secs + 1, 0])).unwrap();
}
}

0 comments on commit 3ac01e3

Please sign in to comment.