Make merde_time flags make sense

Author: fasterthanlime

merde/Cargo.toml

@@ -28,15 +28,17 @@ required-features = ["json"]
 [dependencies]
 merde_core = { version = "4.0.2", path = "../merde_core", optional = true }
 merde_json = { version = "4.0.2", path = "../merde_json", optional = true }
-merde_time = { version = "4.0.2", path = "../merde_time", optional = true }
+merde_time = { version = "4.0.2", path = "../merde_time", optional = true, features = [
+    "merde",
+] }
 
 [features]
 default = ["core", "deserialize"]
 full = ["core", "deserialize", "json", "time"]
-deserialize = ["core"]
+deserialize = ["core", "merde_time/deserialize"]
 core = ["dep:merde_core"]
 compact_str = ["merde_core/compact_str"]
 serde = ["merde_core/serde"]
 
-json = ["dep:merde_json"]
+json = ["dep:merde_json", "merde_time/json"]
 time = ["dep:merde_time"]

merde_time/Cargo.toml

@@ -22,6 +22,6 @@ time = { version = "0.3.36", features = ["macros"] }
 default = []
 full = ["merde", "json", "serialize", "deserialize"]
 merde = ["dep:merde_core"]
-json = ["merde", "dep:merde_json"]
+json = ["merde", "dep:merde_json", "serialize"]
 serialize = ["time/formatting"]
-deserialize = ["time/parsing"]
+deserialize = ["merde", "time/parsing"]

merde_time/src/lib.rs

@@ -54,14 +54,9 @@ where
 }
 
 #[cfg(feature = "merde")]
-mod merde_impls {}
-
-#[cfg(feature = "json")]
-mod merde_json_impls {
+mod merde_impls {
     use super::*;
 
-    use time::OffsetDateTime;
-
     impl merde_core::IntoStatic for Rfc3339<OffsetDateTime> {
         type Output = Rfc3339<OffsetDateTime>;
 
@@ -70,19 +65,6 @@ mod merde_json_impls {
         }
     }
 
-    #[cfg(feature = "serialize")]
-    impl merde_json::JsonSerialize for Rfc3339<time::OffsetDateTime> {
-        fn json_serialize(&self, s: &mut merde_json::JsonSerializer) {
-            // Note: we assume there's no need to escape the string
-            let buf = s.as_mut_vec();
-            buf.push(b'"');
-            self.0
-                .format_into(buf, &time::format_description::well_known::Rfc3339)
-                .unwrap();
-            buf.push(b'"');
-        }
-    }
-
     #[cfg(feature = "deserialize")]
     impl<'s> merde_core::ValueDeserialize<'s> for Rfc3339<time::OffsetDateTime> {
         fn from_value_ref<'val>(
@@ -108,6 +90,24 @@ mod merde_json_impls {
     }
 }
 
+#[cfg(feature = "json")]
+mod merde_json_impls {
+    use super::*;
+
+    #[cfg(feature = "serialize")]
+    impl merde_json::JsonSerialize for Rfc3339<time::OffsetDateTime> {
+        fn json_serialize(&self, s: &mut merde_json::JsonSerializer) {
+            // Note: we assume there's no need to escape the string
+            let buf = s.as_mut_vec();
+            buf.push(b'"');
+            self.0
+                .format_into(buf, &time::format_description::well_known::Rfc3339)
+                .unwrap();
+            buf.push(b'"');
+        }
+    }
+}
+
 #[cfg(all(test, feature = "full",))]
 mod tests {
     use super::*;