pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jingle_ibb: Simplify parsing and remove clones.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-24 23:59:45 +01:00
parent 3678d9f0d3
commit 9bb65ea8fb
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/jingle_ibb.rs
View file

@ -25,21 +25,17 @@ impl TryFrom<Element> for Transport {
type Error = Error; type Error = Error;
fn try_from(elem: Element) -> Result<Transport, Error> { fn try_from(elem: Element) -> Result<Transport, Error> {
if elem.is("transport", ns::JINGLE_IBB) { if !elem.is("transport", ns::JINGLE_IBB) {
return Err(Error::ParseError("This is not an JingleIBB element."))
}
for _ in elem.children() { for _ in elem.children() {
return Err(Error::ParseError("Unknown child in JingleIBB element.")); return Err(Error::ParseError("Unknown child in JingleIBB element."));
} }
let block_size = get_attr!(elem, "block-size", required);
let sid = get_attr!(elem, "sid", required);
let stanza = get_attr!(elem, "stanza", default);
Ok(Transport { Ok(Transport {
block_size: block_size, block_size: get_attr!(elem, "block-size", required),
sid: sid, sid: get_attr!(elem, "sid", required),
stanza: stanza stanza: get_attr!(elem, "stanza", default),
}) })
} else {
Err(Error::ParseError("This is not an JingleIBB element."))
}
} }
} }
@ -48,8 +44,8 @@ impl Into<Element> for Transport {
Element::builder("transport") Element::builder("transport")
.ns(ns::JINGLE_IBB) .ns(ns::JINGLE_IBB)
.attr("block-size", format!("{}", self.block_size)) .attr("block-size", format!("{}", self.block_size))
.attr("sid", self.sid.clone()) .attr("sid", self.sid)
.attr("stanza", self.stanza.clone()) .attr("stanza", self.stanza)
.build() .build()
} }
} }