Well, good thing I gave that a check before releasing Like a madman.

Author: fasterthanlime

Justfile

@@ -15,7 +15,12 @@ check:
     popd
 
     pushd merde
-    EXAMPLES=($(cd examples && for i in *; do echo "${i%.rs}"; done))
+    EXAMPLES=()
+    for file in examples/*.rs; do
+        EXAMPLES+=("$(basename "${file%.rs}")")
+    done
+    echo "EXAMPLES: ${EXAMPLES[@]}"
+
     for example in "${EXAMPLES[@]}"; do
       cargo run --features full,ahash --example "$example"
     done

merde/Cargo.toml

@@ -55,6 +55,11 @@ name = "opinions"
 path = "examples/opinions.rs"
 required-features = ["json"]
 
+[[example]]
+name = "mousedown"
+path = "examples/mousedown.rs"
+required-features = ["json"]
+
 [dependencies]
 merde_core = { version = "10.0.1", path = "../merde_core", optional = true }
 merde_json = { version = "10.0.1", path = "../merde_json", optional = true }
@@ -65,14 +70,14 @@ ahash = { version = "0.8.11", optional = true }
 [features]
 default = ["core"]
 full = [
-    "core",
-    "serialize",
-    "deserialize",
-    "json",
-    "yaml",
-    "msgpack",
-    "time",
-    "rusqlite",
+  "core",
+  "serialize",
+  "deserialize",
+  "json",
+  "yaml",
+  "msgpack",
+  "time",
+  "rusqlite",
 ]
 core = ["dep:merde_core"]
 serialize = ["core"]
@@ -90,4 +95,3 @@ msgpack = ["dep:merde_msgpack"]
 
 # others
 ahash = ["dep:ahash"]
-

merde/examples/mousedown.rs

@@ -0,0 +1,45 @@
+#[derive(Debug)]
+enum TestEvent {
+    MouseUp(MouseUp),
+    MouseDown(MouseDown),
+}
+
+merde::derive! {
+    impl (Serialize, Deserialize) for enum TestEvent
+    externally_tagged {
+        "mouseup" => MouseUp,
+        "mousedown" => MouseDown,
+    }
+}
+
+#[derive(Debug, PartialEq, Eq)]
+struct MouseUp {
+    x: i32,
+    y: i32,
+}
+
+merde::derive! {
+    impl (Serialize, Deserialize) for struct MouseUp {
+        x,
+        y
+    }
+}
+
+#[derive(Debug, PartialEq, Eq)]
+struct MouseDown {
+    x: i32,
+    y: i32,
+}
+
+merde::derive! {
+    impl (Serialize, Deserialize) for struct MouseDown {
+        x,
+        y
+    }
+}
+
+fn main() {
+    let input = r#"{"mouseup": {"x": 100, "y": 200}}"#;
+    let event: TestEvent = merde::json::from_str(input).unwrap();
+    println!("TestEvent: {:?}", event);
+}

merde/src/lib.rs

@@ -23,7 +23,7 @@ macro_rules! impl_deserialize {
             async fn deserialize(__de: &mut dyn $crate::DynDeserializer<'s>) -> Result<Self, $crate::MerdeError<'s>> {
                 use $crate::DynDeserializerExt;
 
-                Ok(Self($crate::Deserialize::deserialize(__de).await?))
+                Ok(Self($crate::DynDeserializerExt::t(__de).await?))
             }
         }
     };
@@ -169,13 +169,13 @@ macro_rules! impl_deserialize {
         impl<'s> $crate::Deserialize<'s> for $enum_name {
             async fn deserialize(__de: &mut dyn $crate::DynDeserializer<'s>) -> Result<Self, $crate::MerdeError<'s>> {
                 #[allow(unused_imports)]
-                use $crate::{MerdeError, DynDeserializerExt};
+                use $crate::MerdeError;
 
                 __de.next().await?.into_map_start()?;
                 let key = __de.next().await?.into_str()?;
                 match key.as_ref() {
                     $($variant_str => {
-                        let value = $crate::Deserialize::deserialize(__de).await?;
+                        let value = $crate::DynDeserializerExt::t(__de).await?;
                         __de.next().await?.into_map_end()?;
                         Ok($enum_name::$variant(value))
                     },)*
@@ -531,10 +531,11 @@ macro_rules! impl_serialize {
                 serializer: &'fut mut dyn $crate::DynSerializer,
             ) -> impl ::std::future::Future<Output = Result<(), $crate::MerdeError<'static>>> + 'fut {
                 async move {
-                    $crate::Serialize::serialize(&$crate::Event::MapStart($crate::MapStart {
-                        size_hint: Some(1),
-                    }), serializer)
-                    .await?;
+                    serializer
+                        .write($crate::Event::MapStart($crate::MapStart {
+                            size_hint: Some(1),
+                        }))
+                        .await?;
 
                     match self {
                         $(