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

Create streamlined API for taking value out deserializer

This commit is contained in:
Dirkjan Ochtman 2022-09-07 09:28:59 +02:00
parent cd37e306ad
commit 744faa1225
2 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,26 @@ impl<'cx, 'xml> Deserializer<'cx, 'xml> {
}
}
pub fn take_str(&mut self) -> Result<&'xml str, Error> {
let (value, element) = match self.next() {
Some(Ok(Node::AttributeValue(s))) => (s, false),
Some(Ok(Node::Element(s))) => (s, true),
Some(Ok(_)) => return Err(Error::ExpectedScalar),
Some(Err(e)) => return Err(e),
None => return Ok(""),
};
if element {
match self.next() {
Some(Ok(_)) => return Err(Error::UnexpectedState),
Some(Err(e)) => return Err(e),
_ => {}
}
}
Ok(value)
}
pub fn nested<'a>(&'a mut self, element: Element<'xml>) -> Deserializer<'a, 'xml>
where
'cx: 'a,

47
instant-xml/src/impls.rs
View File

@ -2,7 +2,7 @@ use std::borrow::Cow;
use std::fmt;
use std::str::FromStr;
use crate::de::{Kind, Node};
use crate::de::Kind;
use crate::ser::FieldAttribute;
use crate::{Deserializer, Error, FromXml, Serializer, ToXml};
@ -11,28 +11,11 @@ struct FromXmlStr<T: FromStr>(Option<T>);
impl<'xml, T: FromStr> FromXml<'xml> for FromXmlStr<T> {
fn deserialize(deserializer: &mut Deserializer<'_, 'xml>) -> Result<Self, Error> {
let (value, element) = match deserializer.next() {
Some(Ok(Node::AttributeValue(s))) => (s, false),
Some(Ok(Node::Element(s))) => (s, true),
Some(Ok(_)) => return Err(Error::ExpectedScalar),
Some(Err(e)) => return Err(e),
None => return Ok(Self(None)),
};
let value = match T::from_str(value) {
Ok(value) => value,
Err(_) => return Err(Error::UnexpectedValue),
};
if element {
match deserializer.next() {
Some(Ok(_)) => return Err(Error::UnexpectedState),
Some(Err(e)) => return Err(e),
_ => {}
}
let value = deserializer.take_str()?;
match T::from_str(value) {
Ok(value) => Ok(Self(Some(value))),
Err(_) => Err(Error::UnexpectedValue),
}
Ok(Self(Some(value)))
}
const KIND: Kind = Kind::Scalar;
@ -153,24 +136,8 @@ impl<'xml> FromXml<'xml> for &'xml str {
impl<'xml> FromXml<'xml> for Cow<'xml, str> {
fn deserialize(deserializer: &mut Deserializer<'_, 'xml>) -> Result<Self, Error> {
let (value, element) = match deserializer.next() {
Some(Ok(Node::AttributeValue(s))) => (s, false),
Some(Ok(Node::Element(s))) => (s, true),
Some(Ok(_)) => return Err(Error::ExpectedScalar),
Some(Err(e)) => return Err(e),
None => return Err(Error::MissingValue),
};
let value = escape_back(value);
if element {
match deserializer.next() {
Some(Ok(_)) => return Err(Error::UnexpectedState),
Some(Err(e)) => return Err(e),
_ => {}
}
}
Ok(value)
let value = deserializer.take_str()?;
Ok(escape_back(value))
}
const KIND: Kind = Kind::Scalar;