Merge pull request #2383 from Mingun/fix-flatten+static

Fix generation of non-existent lifetime `'de` when enum contains a #[serde(flatten)] field and a `'static` reference
serde-rs · Mar 8, 2023 · 0750eee · 0750eee
2 parents ef551a5 + 38c130a
commit 0750eee
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 2 deletions.
diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs
@@ -954,6 +954,7 @@ fn deserialize_struct(
             lifetime: _serde::__private::PhantomData,
         }
     };
+    let need_seed = deserializer.is_none();
     let dispatch = if let Some(deserializer) = deserializer {
         quote! {
             _serde::Deserializer::deserialize_any(#deserializer, #visitor_expr)
@@ -999,14 +1000,14 @@ fn deserialize_struct(
         _ => None,
     };
 
-    let visitor_seed = if is_enum && cattrs.has_flatten() {
+    let visitor_seed = if need_seed && is_enum && cattrs.has_flatten() {
         Some(quote! {
             impl #de_impl_generics _serde::de::DeserializeSeed<#delife> for __Visitor #de_ty_generics #where_clause {
                 type Value = #this_type #ty_generics;
 
                 fn deserialize<__D>(self, __deserializer: __D) -> _serde::__private::Result<Self::Value, __D::Error>
                 where
-                    __D: _serde::Deserializer<'de>,
+                    __D: _serde::Deserializer<#delife>,
                 {
                     _serde::Deserializer::deserialize_map(__deserializer, self)
                 }

diff --git a/test_suite/tests/test_gen.rs b/test_suite/tests/test_gen.rs
@@ -892,3 +892,53 @@ pub struct RemotePackedNonCopyDef {
 impl Drop for RemotePackedNonCopyDef {
     fn drop(&mut self) {}
 }
+
+//////////////////////////////////////////////////////////////////////////
+
+/// Regression tests for <https://github.com/serde-rs/serde/issues/2371>
+#[allow(dead_code)]
+mod static_and_flatten {
+    use super::*;
+
+    #[derive(Deserialize)]
+    struct Nested;
+
+    #[derive(Deserialize)]
+    enum ExternallyTagged {
+        Flatten {
+            #[serde(flatten)]
+            nested: Nested,
+            string: &'static str,
+        },
+    }
+
+    #[derive(Deserialize)]
+    #[serde(tag = "tag")]
+    enum InternallyTagged {
+        Flatten {
+            #[serde(flatten)]
+            nested: Nested,
+            string: &'static str,
+        },
+    }
+
+    #[derive(Deserialize)]
+    #[serde(tag = "tag", content = "content")]
+    enum AdjacentlyTagged {
+        Flatten {
+            #[serde(flatten)]
+            nested: Nested,
+            string: &'static str,
+        },
+    }
+
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum UntaggedWorkaround {
+        Flatten {
+            #[serde(flatten)]
+            nested: Nested,
+            string: &'static str,
+        },
+    }
+}