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

eme: Use the new helper macros to simplify parsing.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-10-10 18:10:52 +01:00
commit a2c7529668
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/eme.rs
View file

@ -27,12 +27,9 @@ impl TryFrom<Element> for ExplicitMessageEncryption {
type Err = Error; type Err = Error;
fn try_from(elem: Element) -> Result<ExplicitMessageEncryption, Error> { fn try_from(elem: Element) -> Result<ExplicitMessageEncryption, Error> {
if !elem.is("encryption", ns::EME) { check_self!(elem, "encryption", ns::EME);
return Err(Error::ParseError("This is not an encryption element.")); check_no_children!(elem, "encryption");
} check_no_unknown_attributes!(elem, "encryption", ["namespace", "name"]);
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in encryption element."));
}
Ok(ExplicitMessageEncryption { Ok(ExplicitMessageEncryption {
namespace: get_attr!(elem, "namespace", required), namespace: get_attr!(elem, "namespace", required),
name: get_attr!(elem, "name", optional), name: get_attr!(elem, "name", optional),
@ -75,7 +72,7 @@ mod tests {
Error::ParseError(string) => string, Error::ParseError(string) => string,
_ => panic!(), _ => panic!(),
}; };
assert_eq!(message, "This is not an encryption element."); assert_eq!(message, "This is not a encryption element.");
} }
#[test] #[test]