delay, eme, stanza_error: Use get_attr!.

This commit is contained in:
Emmanuel Gil Peyrot 2017-05-23 01:02:23 +01:00
commit e3f1f31718
4 changed files with 11 additions and 17 deletions

View file

@ -28,8 +28,8 @@ impl<'a> TryFrom<&'a Element> for ExplicitMessageEncryption {
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in encryption element."));
}
let namespace = elem.attr("namespace").ok_or(Error::ParseError("Mandatory argument 'namespace' not present in encryption element."))?.to_owned();
let name = elem.attr("name").and_then(|value| value.parse().ok());
let namespace = get_attr!(elem, "namespace", required);
let name = get_attr!(elem, "name", optional);
Ok(ExplicitMessageEncryption {
namespace: namespace,
name: name,