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

port error.rs to error_chain, bump version to 0.4.0

Browse source
This commit is contained in:
lumi 2017-05-22 19:20:01 +02:00
commit 508c971416
4 changed files with 27 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/element.rs
View file

@ -7,7 +7,7 @@ use std::collections::btree_map;
use std::fmt;
use error::Error;
use error::{Error, ErrorKind, Result};
use xml::reader::{XmlEvent as ReaderEvent, EventReader};
use xml::writer::{XmlEvent as WriterEvent, EventWriter, EmitterConfig};
@ -100,7 +100,7 @@ impl fmt::Debug for Element {
impl FromStr for Element {
type Err = Error;
fn from_str(s: &str) -> Result<Element, Error> {
fn from_str(s: &str) -> Result<Element> {
let mut reader = EventReader::new(Cursor::new(s));
Element::from_reader(&mut reader)
}
@ -246,7 +246,7 @@ impl Element {
}
/// Parse a document from an `EventReader`.
pub fn from_reader<R: Read>(reader: &mut EventReader<R>) -> Result<Element, Error> {
pub fn from_reader<R: Read>(reader: &mut EventReader<R>) -> Result<Element> {
loop {
let e = reader.next()?;
match e {
@ -272,7 +272,7 @@ impl Element {
return Ok(root);
},
ReaderEvent::EndDocument => {
return Err(Error::EndOfDocument);
bail!(ErrorKind::EndOfDocument);
},
_ => () // TODO: may need more errors
}
@ -280,7 +280,7 @@ impl Element {
}
#[cfg_attr(feature = "cargo-clippy", allow(wrong_self_convention))]
fn from_reader_inner<R: Read>(&mut self, reader: &mut EventReader<R>) -> Result<(), Error> {
fn from_reader_inner<R: Read>(&mut self, reader: &mut EventReader<R>) -> Result<()> {
loop {
let e = reader.next()?;
match e {
@ -312,7 +312,7 @@ impl Element {
self.append_text_node(s);
},
ReaderEvent::EndDocument => {
return Err(Error::EndOfDocument);
bail!(ErrorKind::EndOfDocument);
},
_ => (), // TODO: may need to implement more
}
@ -320,7 +320,7 @@ impl Element {
}
/// Output a document to an `EventWriter`.
pub fn write_to<W: Write>(&self, writer: &mut EventWriter<W>) -> Result<(), Error> {
pub fn write_to<W: Write>(&self, writer: &mut EventWriter<W>) -> Result<()> {
let name = if let Some(ref ns) = self.namespace {
Name::qualified(&self.name, ns, None)
}