From c24d2cdaac7ee9841cc2cab8dec213e22e6da8fa Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Sat, 26 Nov 2022 14:56:33 -0800 Subject: [PATCH] Remove unnecessary Deserializer lifetime --- instant-xml-macros/src/de.rs | 10 +++++----- instant-xml/src/impls.rs | 16 ++++++++-------- instant-xml/src/lib.rs | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/instant-xml-macros/src/de.rs b/instant-xml-macros/src/de.rs index d9f2e2b..7780a82 100644 --- a/instant-xml-macros/src/de.rs +++ b/instant-xml-macros/src/de.rs @@ -56,7 +56,7 @@ fn deserialize_scalar_enum( quote!( impl #impl_generics FromXml<'xml> for #ident #ty_generics #where_clause { fn deserialize<'cx>( - deserializer: &'cx mut ::instant_xml::Deserializer<'cx, 'xml>, + deserializer: &mut ::instant_xml::Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), ::instant_xml::Error> { use ::instant_xml::Error; @@ -138,7 +138,7 @@ fn deserialize_wrapped_enum( quote!( impl #xml_impl_generics FromXml<'xml> for #ident #ty_generics #where_clause { fn deserialize<'cx>( - deserializer: &'cx mut ::instant_xml::Deserializer<'cx, 'xml>, + deserializer: &mut ::instant_xml::Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), ::instant_xml::Error> { use ::instant_xml::de::Node; @@ -245,7 +245,7 @@ fn deserialize_struct( quote!( impl #xml_impl_generics FromXml<'xml> for #ident #ty_generics #where_clause { fn deserialize<'cx>( - deserializer: &'cx mut ::instant_xml::Deserializer<'cx, 'xml>, + deserializer: &mut ::instant_xml::Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), ::instant_xml::Error> { use ::instant_xml::de::Node; @@ -414,7 +414,7 @@ fn deserialize_tuple_struct( quote!( impl #xml_impl_generics FromXml<'xml> for #ident #ty_generics #where_clause { fn deserialize<'cx>( - deserializer: &'cx mut ::instant_xml::Deserializer<'cx, 'xml>, + deserializer: &mut ::instant_xml::Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), ::instant_xml::Error> { use ::instant_xml::de::Node; @@ -488,7 +488,7 @@ fn deserialize_unit_struct(input: &syn::DeriveInput, meta: &ContainerMeta) -> To quote!( impl #xml_impl_generics FromXml<'xml> for #ident #ty_generics #where_clause { fn deserialize<'cx>( - deserializer: &'cx mut ::instant_xml::Deserializer<'cx, 'xml>, + deserializer: &mut ::instant_xml::Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), ::instant_xml::Error> { deserializer.ignore()?; diff --git a/instant-xml/src/impls.rs b/instant-xml/src/impls.rs index 2a52992..0651368 100644 --- a/instant-xml/src/impls.rs +++ b/instant-xml/src/impls.rs @@ -34,7 +34,7 @@ impl<'xml, T: FromStr> FromXml<'xml> for FromXmlStr { impl<'xml> FromXml<'xml> for bool { fn deserialize<'cx>( - deserializer: &'cx mut Deserializer<'cx, 'xml>, + deserializer: &mut Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), Error> { if into.is_some() { @@ -107,7 +107,7 @@ macro_rules! from_xml_for_number { ($typ:ty) => { impl<'xml> FromXml<'xml> for $typ { fn deserialize<'cx>( - deserializer: &'cx mut Deserializer<'cx, 'xml>, + deserializer: &mut Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), Error> { if into.is_some() { @@ -145,7 +145,7 @@ from_xml_for_number!(f64); impl<'xml> FromXml<'xml> for char { fn deserialize<'cx>( - deserializer: &'cx mut Deserializer<'cx, 'xml>, + deserializer: &mut Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), Error> { if into.is_some() { @@ -168,7 +168,7 @@ impl<'xml> FromXml<'xml> for char { impl<'xml> FromXml<'xml> for String { fn deserialize<'cx>( - deserializer: &'cx mut Deserializer<'cx, 'xml>, + deserializer: &mut Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), Error> { if into.is_some() { @@ -191,7 +191,7 @@ impl<'xml> FromXml<'xml> for String { impl<'xml> FromXml<'xml> for &'xml str { fn deserialize<'cx>( - deserializer: &'cx mut Deserializer<'cx, 'xml>, + deserializer: &mut Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), Error> { if into.is_some() { @@ -234,7 +234,7 @@ impl<'xml> FromXml<'xml> for Cow<'xml, str> { impl<'xml, T: FromXml<'xml>> FromXml<'xml> for Option { fn deserialize<'cx>( - deserializer: &'cx mut Deserializer<'cx, 'xml>, + deserializer: &mut Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), Error> { if into.is_some() { @@ -436,7 +436,7 @@ fn decode(input: &str) -> Cow<'_, str> { impl<'xml, T: FromXml<'xml>> FromXml<'xml> for Vec { fn deserialize<'cx>( - deserializer: &'cx mut Deserializer<'cx, 'xml>, + deserializer: &mut Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), Error> { let mut value = None; @@ -503,7 +503,7 @@ impl ToXml for DateTime { #[cfg(feature = "chrono")] impl<'xml> FromXml<'xml> for DateTime { fn deserialize<'cx>( - deserializer: &'cx mut Deserializer<'cx, 'xml>, + deserializer: &mut Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), Error> { if into.is_some() { diff --git a/instant-xml/src/lib.rs b/instant-xml/src/lib.rs index e681ed0..8aa0f17 100644 --- a/instant-xml/src/lib.rs +++ b/instant-xml/src/lib.rs @@ -37,7 +37,7 @@ impl<'a, T: ToXml + ?Sized> ToXml for &'a T { pub trait FromXml<'xml>: Sized { fn deserialize<'cx>( - deserializer: &'cx mut Deserializer<'cx, 'xml>, + deserializer: &mut Deserializer<'cx, 'xml>, into: &mut Option, ) -> Result<(), Error>;