instant-labs
/
instant-xml
mirror of https://github.com/instant-labs/instant-xml.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Inline single-use method consume_next_def_namespace()

This commit is contained in:
Dirkjan Ochtman 2022-09-04 15:39:38 +02:00
parent f33d2e4524
commit 18622fb6e9
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
instant-xml/src/de.rs
View File

@ -167,12 +167,6 @@ impl<'xml> Deserializer<'xml> {
Ok(()) Ok(())
} }
pub fn consume_next_def_namespace(&mut self) -> Option<&'xml str> {
let ret = self.next_def_namespace;
self.next_def_namespace = None;
ret
}
pub(crate) fn deserialize_element<V>(&mut self, visitor: V) -> Result<V::Value, Error> pub(crate) fn deserialize_element<V>(&mut self, visitor: V) -> Result<V::Value, Error>
where where
V: Visitor<'xml>, V: Visitor<'xml>,
@ -183,10 +177,11 @@ impl<'xml> Deserializer<'xml> {
_ => return Err(Error::UnexpectedValue), _ => return Err(Error::UnexpectedValue),
}; };
if tag_data.ns != self.consume_next_def_namespace() { if tag_data.ns != self.next_def_namespace {
return Err(Error::WrongNamespace); return Err(Error::WrongNamespace);
} }
self.next_def_namespace = None;
match self.parser.next() { match self.parser.next() {
Some(Ok(XmlRecord::Element(v))) => { Some(Ok(XmlRecord::Element(v))) => {
let ret = visitor.visit_str(v); let ret = visitor.visit_str(v);