From f51e6ae063cd4f45bcfc0e56981ddb450743e8d5 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Tue, 28 Feb 2023 16:31:50 +0100
Subject: [PATCH] Fix use of lifetimes in fields of transparent structs

---
 instant-xml-macros/src/de.rs     | 18 +++++++++++-------
 instant-xml/tests/transparent.rs | 16 ++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/instant-xml-macros/src/de.rs b/instant-xml-macros/src/de.rs
index abb983b..37ebfd2 100644
--- a/instant-xml-macros/src/de.rs
+++ b/instant-xml-macros/src/de.rs
@@ -437,11 +437,13 @@ fn deserialize_inline_struct(
 
         let field_ty = data.no_lifetime_type;
         matches.extend(quote!(
-            #field_ty::matches(id, None)
+            <#field_ty as FromXml<'xml>>::matches(id, None)
         ));
 
         let field_name = &field.ident;
-        acc_field_defs.extend(quote!(#field_name: <#field_ty as FromXml<'xml>>::Accumulator,));
+        let field_ty_with_lifetime = &field.ty;
+        acc_field_defs
+            .extend(quote!(#field_name: <#field_ty_with_lifetime as FromXml<'xml>>::Accumulator,));
         let field_str = format!("{}::{}", input.ident, data.field_name);
         acc_field_inits.extend(quote!(#field_name: self.#field_name.try_done(#field_str)?,));
         acc_field_defaults.extend(quote!(#field_name: Default::default(),));
@@ -450,11 +452,13 @@ fn deserialize_inline_struct(
             deserialize.extend(quote!(else));
         }
         if let Some(with) = data.deserialize_with {
-            deserialize.extend(quote!(if #field_ty::matches(current, None) {
-                #with(&mut into.#field_name, #field_str, deserializer)?;
-            }));
+            deserialize.extend(
+                quote!(if <#field_ty as FromXml<'xml>>::matches(current, None) {
+                    #with(&mut into.#field_name, #field_str, deserializer)?;
+                }),
+            );
         } else {
-            deserialize.extend(quote!(if #field_ty::matches(current, None) {
+            deserialize.extend(quote!(if <#field_ty as FromXml<'xml>>::matches(current, None) {
                 match <#field_ty as FromXml>::KIND {
                     Kind::Element => {
                         <#field_ty>::deserialize(&mut into.#field_name, #field_str, deserializer)?;
@@ -505,7 +509,7 @@ fn deserialize_inline_struct(
         }
 
         impl #xml_impl_generics ::instant_xml::Accumulate<#ident #ty_generics> for #accumulator #xml_ty_generics #where_clause {
-            fn try_done(self, field: &'static str) -> Result<#ident #ty_generics, ::instant_xml::Error> {
+            fn try_done(self, _: &'static str) -> Result<#ident #ty_generics, ::instant_xml::Error> {
                 Ok(#ident {
                     #acc_field_inits
                 })
diff --git a/instant-xml/tests/transparent.rs b/instant-xml/tests/transparent.rs
index a703ad6..15aee7e 100644
--- a/instant-xml/tests/transparent.rs
+++ b/instant-xml/tests/transparent.rs
@@ -1,17 +1,19 @@
+use std::borrow::Cow;
+
 use similar_asserts::assert_eq;
 
 use instant_xml::{from_str, to_string, Error, FromXml, ToXml};
 
 #[derive(Debug, Eq, FromXml, PartialEq, ToXml)]
 struct Wrapper {
-    inline: Inline,
+    inline: Inline<'static>,
 }
 
 #[derive(Debug, Eq, FromXml, PartialEq, ToXml)]
 #[xml(transparent)]
-struct Inline {
+struct Inline<'a> {
     foo: Foo,
-    bar: Bar,
+    bar: Bar<'a>,
 }
 
 #[derive(Debug, Eq, FromXml, PartialEq, ToXml)]
@@ -20,8 +22,8 @@ struct Foo {
 }
 
 #[derive(Debug, Eq, FromXml, PartialEq, ToXml)]
-struct Bar {
-    s: String,
+struct Bar<'a> {
+    s: Cow<'a, str>,
 }
 
 #[test]
@@ -29,9 +31,7 @@ fn inline() {
     let v = Wrapper {
         inline: Inline {
             foo: Foo { i: 42 },
-            bar: Bar {
-                s: "hello".to_string(),
-            },
+            bar: Bar { s: "hello".into() },
         },
     };