Skip to content

Commit dfe5349

Browse files
committed
fmt
1 parent f3f66ee commit dfe5349

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

src/time_delta.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,24 @@ pub struct TimeDelta {
6464

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

7272
#[cfg(feature = "serde")]
7373
impl<'de> serde::Deserialize<'de> for TimeDelta {
74-
fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
75-
let (secs, nanos) = <(i64, i32) as serde::Deserialize>::deserialize(deserializer)?;
76-
if secs < MIN.secs
77-
|| secs > MAX.secs
74+
fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
75+
let (secs, nanos) = <(i64, i32) as serde::Deserialize>::deserialize(deserializer)?;
76+
if !(MIN.secs..=MAX.secs).contains(&secs)
7877
|| nanos >= 1_000_000_000
7978
|| (secs == MAX.secs && nanos > MAX.nanos)
8079
|| (secs == MIN.secs && nanos < MIN.nanos)
8180
{
8281
return Err(serde::de::Error::custom("TimeDelta out of bounds"));
8382
}
84-
Ok(TimeDelta { secs, nanos })
85-
}
83+
Ok(TimeDelta { secs, nanos })
84+
}
8685
}
8786

8887
/// The minimum possible `TimeDelta`: `-i64::MAX` milliseconds.
@@ -1333,6 +1332,9 @@ mod tests {
13331332
#[cfg(feature = "serde")]
13341333
fn test_serde() {
13351334
let duration = TimeDelta::new(123, 456).unwrap();
1336-
assert_eq!(serde_json::from_value::<TimeDelta>(serde_json::to_value(&duration).unwrap()).unwrap(), duration);
1335+
assert_eq!(
1336+
serde_json::from_value::<TimeDelta>(serde_json::to_value(duration).unwrap()).unwrap(),
1337+
duration
1338+
);
13371339
}
13381340
}

0 commit comments

Comments
 (0)