From ff8c0c2886dee267ec1a069e38385389df9278a8 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Sat, 26 Nov 2022 14:58:50 -0800 Subject: [PATCH] Remove unnecessary workaround --- instant-xml-macros/src/de.rs | 3 +-- instant-xml/src/de.rs | 13 ------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/instant-xml-macros/src/de.rs b/instant-xml-macros/src/de.rs index 01e934d..9c6a28c 100644 --- a/instant-xml-macros/src/de.rs +++ b/instant-xml-macros/src/de.rs @@ -466,9 +466,8 @@ fn unnamed_field( None => return Err(Error::MissingValue(&<#no_lifetime_type as FromXml>::KIND)), } Kind::Scalar => { - let mut nested = deserializer.for_scalar(); let mut value: Option<#no_lifetime_type> = None; - <#no_lifetime_type>::deserialize(&mut nested, &mut value)?; + <#no_lifetime_type>::deserialize(deserializer, &mut value)?; value } }; diff --git a/instant-xml/src/de.rs b/instant-xml/src/de.rs index 583660e..08f7560 100644 --- a/instant-xml/src/de.rs +++ b/instant-xml/src/de.rs @@ -59,19 +59,6 @@ impl<'cx, 'xml> Deserializer<'cx, 'xml> { } } - pub fn for_scalar<'a>(&'a mut self) -> Deserializer<'a, 'xml> - where - 'cx: 'a, - { - Deserializer { - local: self.local, - prefix: self.prefix, - level: self.level, - done: self.done, - context: self.context, - } - } - pub fn for_node<'a>(&'a mut self, node: Node<'xml>) -> Deserializer<'a, 'xml> where 'cx: 'a,