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

hashes, presence, message, iq, disco: Use get_attr!.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-22 19:00:04 +01:00
commit d61d09f5b7
5 changed files with 32 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/iq.rs
View file

@ -100,16 +100,10 @@ impl<'a> TryFrom<&'a Element> for Iq {
if !root.is("iq", ns::JABBER_CLIENT) {
return Err(Error::ParseError("This is not an iq element."));
}
let from = root.attr("from")
.and_then(|value| value.parse().ok());
let to = root.attr("to")
.and_then(|value| value.parse().ok());
let id = root.attr("id")
.and_then(|value| value.parse().ok());
let type_ = match root.attr("type") {
Some(type_) => type_,
None => return Err(Error::ParseError("Iq element requires a 'type' attribute.")),
};
let from = get_attr!(root, "from", optional);
let to = get_attr!(root, "to", optional);
let id = get_attr!(root, "id", optional);
let type_: String = get_attr!(root, "type", required);
let mut payload = None;
let mut error_payload = None;
@ -218,7 +212,7 @@ mod tests {
Error::ParseError(string) => string,
_ => panic!(),
};
assert_eq!(message, "Iq element requires a 'type' attribute.");
assert_eq!(message, "Required attribute 'type' missing.");
}
#[test]