From f3795560542d457be76dc0b0bad61eb7883ce89c Mon Sep 17 00:00:00 2001
From: Amos Wenger <amos@bearcove.net>
Date: Wed, 20 Nov 2024 16:13:09 +0100
Subject: [PATCH] Fix deser/ser impls in merde_time after phasing out
 JsonSerialize trait

---
 merde/Cargo.toml      |  2 +-
 merde_time/Cargo.toml |  5 +++--
 merde_time/src/lib.rs | 11 +++--------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/merde/Cargo.toml b/merde/Cargo.toml
index 22e607e..f2c08ee 100644
--- a/merde/Cargo.toml
+++ b/merde/Cargo.toml
@@ -85,7 +85,7 @@ serde = ["merde_core/serde"]
 rusqlite = ["merde_core/rusqlite"]
 
 # non-core crates
-json = ["dep:merde_json", "merde_time/json"]
+json = ["dep:merde_json"]
 yaml = ["dep:merde_yaml"]
 msgpack = ["dep:merde_msgpack"]
 time = ["dep:merde_time"]
diff --git a/merde_time/Cargo.toml b/merde_time/Cargo.toml
index 3313a3a..977ee3e 100644
--- a/merde_time/Cargo.toml
+++ b/merde_time/Cargo.toml
@@ -16,12 +16,13 @@ merde_json = { version = "8.0.1", path = "../merde_json", optional = true }
 time = "0.3.36"
 
 [dev-dependencies]
+merde_json = { path = "../merde_json" }
 time = { version = "0.3.36", features = ["macros"] }
 
 [features]
 default = []
-full = ["merde", "json", "serialize", "deserialize"]
+full = ["merde", "serialize", "deserialize"]
 merde = ["dep:merde_core"]
-json = ["merde", "dep:merde_json", "serialize"]
+json = []
 serialize = ["time/formatting"]
 deserialize = ["merde", "time/parsing"]
diff --git a/merde_time/src/lib.rs b/merde_time/src/lib.rs
index 4312b92..d915ca2 100644
--- a/merde_time/src/lib.rs
+++ b/merde_time/src/lib.rs
@@ -1,5 +1,5 @@
 //! Provides [Rfc3339], a wrapper around [time::OffsetDateTime] that implements
-//! [merde_json::JsonSerialize] and [merde_core::Deserialize] when the right
+//! [merde_core::Serialize] and [merde_core::Deserialize] when the right
 //! cargo features are enabled.
 
 use std::{
@@ -9,7 +9,7 @@ use std::{
 
 pub use time::OffsetDateTime;
 
-/// A wrapper around date-time types that implements `JsonSerialize` and `JsonDeserialize`
+/// A wrapper around date-time types that implements `Serialize` and `Deserialize`
 /// when the right cargo features are enabled.
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[repr(transparent)]
@@ -81,11 +81,6 @@ mod merde_impls {
             ))
         }
     }
-}
-
-#[cfg(feature = "json")]
-mod merde_json_impls {
-    use super::*;
 
     #[cfg(feature = "serialize")]
     impl merde_core::Serialize for Rfc3339<time::OffsetDateTime> {
@@ -104,7 +99,7 @@ mod merde_json_impls {
     }
 }
 
-#[cfg(all(test, feature = "full",))]
+#[cfg(all(test, feature = "full"))]
 mod tests {
     use super::*;
     use merde_json::{from_str, JsonSerialize};