Fix sub-second negative Duration serialization

time-rs · Oct 8, 2024 · b3b5fb9 · b3b5fb9
1 parent 9a7603f
commit b3b5fb9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/tests/serde/mod.rs b/tests/serde/mod.rs
@@ -842,6 +842,14 @@ fn duration() {
         &Duration::ZERO.readable(),
         &[Token::BorrowedStr("0.000000000")],
     );
+    assert_tokens(
+        &Duration::nanoseconds(123).readable(),
+        &[Token::BorrowedStr("0.000000123")],
+    );
+    assert_tokens(
+        &Duration::nanoseconds(-123).readable(),
+        &[Token::BorrowedStr("-0.000000123")],
+    );
 }
 
 #[test]

diff --git a/time/src/serde/mod.rs b/time/src/serde/mod.rs
@@ -255,9 +255,10 @@ impl Serialize for Duration {
         #[cfg(feature = "serde-human-readable")]
         if serializer.is_human_readable() {
             return serializer.collect_str(&format_args!(
-                "{}.{:>09}",
-                self.whole_seconds(),
-                self.subsec_nanoseconds().abs()
+                "{}{}.{:>09}",
+                if self.is_negative() { "-" } else { "" },
+                self.whole_seconds().unsigned_abs(),
+                self.subsec_nanoseconds().abs(),
             ));
         }
 

diff --git a/time/src/serde/visitor.rs b/time/src/serde/visitor.rs
@@ -58,7 +58,10 @@ impl<'a> de::Visitor<'a> for Visitor<Duration> {
             de::Error::invalid_value(de::Unexpected::Str(nanoseconds), &"nanoseconds")
         })?;
 
-        if seconds < 0 {
+        if seconds < 0
+            // make sure sign does not disappear when seconds == 0
+            || (seconds == 0 && value.starts_with("-"))
+        {
             nanoseconds *= -1;
         }