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

Clarify Node variant name

This commit is contained in:
Dirkjan Ochtman 2022-09-07 12:42:51 +02:00
parent 7d241959d8
commit 3b07f39881
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ impl<'cx, 'xml> Deserializer<'cx, 'xml> {
pub fn take_str(&mut self) -> Result<&'xml str, Error> { pub fn take_str(&mut self) -> Result<&'xml str, Error> {
let (value, element) = match self.next() { let (value, element) = match self.next() {
Some(Ok(Node::AttributeValue(s))) => (s, false), Some(Ok(Node::AttributeValue(s))) => (s, false),
Some(Ok(Node::Element(s))) => (s, true), Some(Ok(Node::Text(s))) => (s, true),
Some(Ok(_)) => return Err(Error::ExpectedScalar), Some(Ok(_)) => return Err(Error::ExpectedScalar),
Some(Err(e)) => return Err(e), Some(Err(e)) => return Err(e),
None => return Ok(""), None => return Ok(""),
@ -278,7 +278,7 @@ impl<'xml> Iterator for Context<'xml> {
} }
} }
Ok(Token::Text { text }) => { Ok(Token::Text { text }) => {
return Some(Ok(Node::Element(text.as_str()))); return Some(Ok(Node::Text(text.as_str())));
} }
Ok(_) => return Some(Err(Error::UnexpectedToken)), Ok(_) => return Some(Err(Error::UnexpectedToken)),
Err(e) => return Some(Err(Error::Parse(e))), Err(e) => return Some(Err(Error::Parse(e))),
@ -295,7 +295,7 @@ pub enum Node<'xml> {
prefix: Option<&'xml str>, prefix: Option<&'xml str>,
local: &'xml str, local: &'xml str,
}, },
Element(&'xml str), Text(&'xml str),
Open(Element<'xml>), Open(Element<'xml>),
} }