xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update quick_xml and migrate from error-chain to failure

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-02-18 19:54:09 +01:00
commit 236582b24e
5 changed files with 61 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/element.rs
View file

@ -7,7 +7,7 @@ use std::str;
use std::rc::Rc;
use std::borrow::Cow;
use error::{Error, ErrorKind, Result};
use error::{Error, Result};
use quick_xml::reader::Reader as EventReader;
use quick_xml::events::{Event, BytesStart};
@ -309,7 +309,7 @@ impl Element {
break build_element(reader, e)?;
},
Event::Eof => {
bail!(ErrorKind::EndOfDocument);
return Err(Error::EndOfDocument);
},
Event::Text { .. } |
Event::End { .. } |
@ -349,23 +349,23 @@ impl Element {
match elem.prefix() {
Some(prefix) => {
if possible_prefix != prefix.as_bytes() {
bail!(ErrorKind::InvalidElementClosed);
return Err(Error::InvalidElementClosed);
}
},
None => {
bail!(ErrorKind::InvalidElementClosed);
return Err(Error::InvalidElementClosed);
},
}
if name != elem.name().as_bytes() {
bail!(ErrorKind::InvalidElementClosed);
return Err(Error::InvalidElementClosed);
}
},
None => {
if elem.prefix().is_some() {
bail!(ErrorKind::InvalidElementClosed);
return Err(Error::InvalidElementClosed);
}
if possible_prefix != elem.name().as_bytes() {
bail!(ErrorKind::InvalidElementClosed);
return Err(Error::InvalidElementClosed);
}
},
}
@ -676,7 +676,7 @@ fn split_element_name<S: AsRef<str>>(s: S) -> Result<(Option<String>, String)> {
match name_parts.len() {
2 => Ok((Some(name_parts[0].to_owned()), name_parts[1].to_owned())),
1 => Ok((None, name_parts[0].to_owned())),
_ => bail!(ErrorKind::InvalidElement),
_ => Err(Error::InvalidElement),
}
}