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

Use check_no_children!() where it makes sense.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-05-14 16:33:47 +02:00
commit 3d495ccf41
6 changed files with 13 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/message.rs
View file

@ -199,18 +199,14 @@ impl TryFrom<Element> for Message {
let mut payloads = vec!();
for elem in root.children() {
if elem.is("body", ns::DEFAULT_NS) {
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in body element."));
}
check_no_children!(elem, "body");
let lang = get_attr!(elem, "xml:lang", default);
let body = Body(elem.text());
if bodies.insert(lang, body).is_some() {
return Err(Error::ParseError("Body element present twice for the same xml:lang."));
}
} else if elem.is("subject", ns::DEFAULT_NS) {
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in subject element."));
}
check_no_children!(elem, "subject");
let lang = get_attr!(elem, "xml:lang", default);
let subject = Subject(elem.text());
if subjects.insert(lang, subject).is_some() {
@ -220,9 +216,7 @@ impl TryFrom<Element> for Message {
if thread.is_some() {
return Err(Error::ParseError("Thread element present twice."));
}
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in thread element."));
}
check_no_children!(elem, "thread");
thread = Some(Thread(elem.text()));
} else {
payloads.push(elem.clone())