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

xmpp_codec: remove packet encoding unwrap()s

Browse source
This commit is contained in:
Astro 2019-01-29 01:50:55 +01:00
commit 39346506c8
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/xmpp_codec.rs
View file

@ -277,20 +277,28 @@ impl Encoder for XMPPCodec {
dst.reserve(max_stanza_size - remaining); dst.reserve(max_stanza_size - remaining);
} }
fn to_io_err<E: Into<Box<dyn std::error::Error + Send + Sync>>>(e: E) -> io::Error {
io::Error::new(io::ErrorKind::InvalidInput, e)
}
match item { match item {
Packet::StreamStart(start_attrs) => { Packet::StreamStart(start_attrs) => {
let mut buf = String::new(); let mut buf = String::new();
write!(buf, "<stream:stream").unwrap(); write!(buf, "<stream:stream")
.map_err(to_io_err)?;
for (name, value) in start_attrs { for (name, value) in start_attrs {
write!(buf, " {}=\"{}\"", escape(&name), escape(&value)).unwrap(); write!(buf, " {}=\"{}\"", escape(&name), escape(&value))
.map_err(to_io_err)?;
if name == "xmlns" { if name == "xmlns" {
self.ns = Some(value); self.ns = Some(value);
} }
} }
write!(buf, ">\n").unwrap(); write!(buf, ">\n")
.map_err(to_io_err)?;
// print!(">> {}", buf); // print!(">> {}", buf);
write!(dst, "{}", buf).map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e)) write!(dst, "{}", buf)
.map_err(to_io_err)
} }
Packet::Stanza(stanza) => { Packet::Stanza(stanza) => {
stanza stanza
@ -299,7 +307,7 @@ impl Encoder for XMPPCodec {
// println!(">> {:?}", dst); // println!(">> {:?}", dst);
Ok(()) Ok(())
}) })
.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, format!("{}", e))) .map_err(|e| to_io_err(format!("{}", e)))
} }
Packet::Text(text) => { Packet::Text(text) => {
write_text(&text, dst) write_text(&text, dst)
@ -307,7 +315,7 @@ impl Encoder for XMPPCodec {
// println!(">> {:?}", dst); // println!(">> {:?}", dst);
Ok(()) Ok(())
}) })
.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, format!("{}", e))) .map_err(to_io_err)
} }
// TODO: Implement all // TODO: Implement all
_ => Ok(()), _ => Ok(()),