fixup! Support jiff types

Signed-off-by: tison <[email protected]>
GREsau · Jan 13, 2025 · 3855539 · 3855539
1 parent f67ad00
commit 3855539
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/schemars/Cargo.toml b/schemars/Cargo.toml
@@ -52,7 +52,7 @@ bytes1 = { version = "1.0", default-features = false, features = ["serde"], pack
 chrono04 = { version = "0.4", default-features = false, features = ["serde"], package = "chrono" }
 either1 = { version = "1.3", default-features = false, features = ["serde"], package = "either" }
 indexmap2 = { version = "2.0", default-features = false, features = ["serde"], package = "indexmap" }
-jiff01 = { version = "0.1", default-features = false, features = ["serde"], package = "jiff" }
+jiff01 = { version = "0.1", features = ["serde"], package = "jiff" }
 rust_decimal1 = { version = "1", default-features = false, features = ["serde"], package = "rust_decimal" }
 semver1 = { version = "1.0.9", default-features = false, features = ["serde"], package = "semver" }
 smallvec1 = { version = "1.0", default-features = false, features = ["serde"], package = "smallvec" }

diff --git a/schemars/src/json_schema_impls/jiff01.rs b/schemars/src/json_schema_impls/jiff01.rs
@@ -31,7 +31,7 @@ macro_rules! formatted_string_impl {
 
 formatted_string_impl!(SignedDuration, "duration");
 formatted_string_impl!(Timestamp, "date-time");
-formatted_string_impl!(Zoned, "date-time");
+formatted_string_impl!(Zoned, "zoned-date-time");
 formatted_string_impl!(Date, "date");
 formatted_string_impl!(Time, "partial-time");
 formatted_string_impl!(DateTime, "partial-date-time");
diff --git a/schemars/tests/integration/jiff.rs b/schemars/tests/integration/jiff.rs
@@ -19,9 +19,12 @@ fn jiff() {
         .assert_allows_ser_roundtrip_default()
         .assert_matches_de_roundtrip(arbitrary_values());
 
-    // test!(Zoned)
-    //     .assert_allows_ser_roundtrip_default()
-    //     .assert_matches_de_roundtrip(arbitrary_values());
+    test!(Zoned)
+        .assert_allows_ser_roundtrip_default()
+        .assert_matches_de_roundtrip(arbitrary_values_except(
+            Value::is_string,
+            "Custom format 'zoned-date-time', so arbitrary strings technically allowed by schema",
+        ));
 
     test!(Date)
         .assert_allows_ser_roundtrip_default()

diff --git a/schemars/tests/integration/snapshots/schemars/tests/integration/jiff.rs~jiff.json b/schemars/tests/integration/snapshots/schemars/tests/integration/jiff.rs~jiff.json
@@ -9,7 +9,7 @@
     },
     "date_time_zoned": {
       "type": "string",
-      "format": "date-time"
+      "format": "zoned-date-time"
     },
     "naive_date": {
       "type": "string",