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

Fix most clippy warnings.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-07 15:23:06 +01:00
commit 4ec92b16ac
5 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/jingle_s5b.rs
View file

@ -182,7 +182,7 @@ impl<'a> TryFrom<&'a Element> for Transport {
}); });
TransportPayload::Candidates(candidates) TransportPayload::Candidates(candidates)
} else if child.is("activated", ns::JINGLE_S5B) { } else if child.is("activated", ns::JINGLE_S5B) {
if let Some(_) = payload { if payload.is_some() {
return Err(Error::ParseError("Non-activated child already present in JingleS5B transport element.")); return Err(Error::ParseError("Non-activated child already present in JingleS5B transport element."));
} }
let cid = child.attr("cid") let cid = child.attr("cid")
@ -190,12 +190,12 @@ impl<'a> TryFrom<&'a Element> for Transport {
.parse()?; .parse()?;
TransportPayload::Activated(cid) TransportPayload::Activated(cid)
} else if child.is("candidate-error", ns::JINGLE_S5B) { } else if child.is("candidate-error", ns::JINGLE_S5B) {
if let Some(_) = payload { if payload.is_some() {
return Err(Error::ParseError("Non-candidate-error child already present in JingleS5B transport element.")); return Err(Error::ParseError("Non-candidate-error child already present in JingleS5B transport element."));
} }
TransportPayload::CandidateError TransportPayload::CandidateError
} else if child.is("candidate-used", ns::JINGLE_S5B) { } else if child.is("candidate-used", ns::JINGLE_S5B) {
if let Some(_) = payload { if payload.is_some() {
return Err(Error::ParseError("Non-candidate-used child already present in JingleS5B transport element.")); return Err(Error::ParseError("Non-candidate-used child already present in JingleS5B transport element."));
} }
let cid = child.attr("cid") let cid = child.attr("cid")
@ -203,7 +203,7 @@ impl<'a> TryFrom<&'a Element> for Transport {
.parse()?; .parse()?;
TransportPayload::CandidateUsed(cid) TransportPayload::CandidateUsed(cid)
} else if child.is("proxy-error", ns::JINGLE_S5B) { } else if child.is("proxy-error", ns::JINGLE_S5B) {
if let Some(_) = payload { if payload.is_some() {
return Err(Error::ParseError("Non-proxy-error child already present in JingleS5B transport element.")); return Err(Error::ParseError("Non-proxy-error child already present in JingleS5B transport element."));
} }
TransportPayload::ProxyError TransportPayload::ProxyError

5
src/mam.rs
View file

@ -217,10 +217,7 @@ impl<'a> Into<Element> for &'a Fin {
fn into(self) -> Element { fn into(self) -> Element {
let mut elem = Element::builder("fin") let mut elem = Element::builder("fin")
.ns(ns::MAM) .ns(ns::MAM)
.attr("complete", match self.complete { .attr("complete", if self.complete { Some("true") } else { None })
true => Some("true"),
false => None,
})
.build(); .build();
elem.append_child((&self.set).into()); elem.append_child((&self.set).into());
elem elem

4
src/message.rs
View file

@ -129,7 +129,7 @@ impl<'a> TryFrom<&'a Element> for Message {
return Err(Error::ParseError("Unknown child in body element.")); return Err(Error::ParseError("Unknown child in body element."));
} }
let lang = elem.attr("xml:lang").unwrap_or("").to_owned(); let lang = elem.attr("xml:lang").unwrap_or("").to_owned();
if let Some(_) = bodies.insert(lang, elem.text()) { if bodies.insert(lang, elem.text()).is_some() {
return Err(Error::ParseError("Body element present twice for the same xml:lang.")); return Err(Error::ParseError("Body element present twice for the same xml:lang."));
} }
} else if elem.is("subject", ns::JABBER_CLIENT) { } else if elem.is("subject", ns::JABBER_CLIENT) {
@ -137,7 +137,7 @@ impl<'a> TryFrom<&'a Element> for Message {
return Err(Error::ParseError("Unknown child in subject element.")); return Err(Error::ParseError("Unknown child in subject element."));
} }
let lang = elem.attr("xml:lang").unwrap_or("").to_owned(); let lang = elem.attr("xml:lang").unwrap_or("").to_owned();
if let Some(_) = subjects.insert(lang, elem.text()) { if subjects.insert(lang, elem.text()).is_some() {
return Err(Error::ParseError("Subject element present twice for the same xml:lang.")); return Err(Error::ParseError("Subject element present twice for the same xml:lang."));
} }
} else if elem.is("thread", ns::JABBER_CLIENT) { } else if elem.is("thread", ns::JABBER_CLIENT) {

2
src/presence.rs
View file

@ -170,7 +170,7 @@ impl<'a> TryFrom<&'a Element> for Presence {
return Err(Error::ParseError("Unknown child in status element.")); return Err(Error::ParseError("Unknown child in status element."));
} }
let lang = elem.attr("xml:lang").unwrap_or("").to_owned(); let lang = elem.attr("xml:lang").unwrap_or("").to_owned();
if let Some(_) = statuses.insert(lang, elem.text()) { if statuses.insert(lang, elem.text()).is_some() {
return Err(Error::ParseError("Status element present twice for the same xml:lang.")); return Err(Error::ParseError("Status element present twice for the same xml:lang."));
} }
} else if elem.is("priority", ns::JABBER_CLIENT) { } else if elem.is("priority", ns::JABBER_CLIENT) {

2
src/stanza_error.rs
View file

@ -173,7 +173,7 @@ impl<'a> TryFrom<&'a Element> for StanzaError {
return Err(Error::ParseError("Unknown element in error text.")); return Err(Error::ParseError("Unknown element in error text."));
} }
let lang = child.attr("xml:lang").unwrap_or("").to_owned(); let lang = child.attr("xml:lang").unwrap_or("").to_owned();
if let Some(_) = texts.insert(lang, child.text()) { if texts.insert(lang, child.text()).is_some() {
return Err(Error::ParseError("Text element present twice for the same xml:lang.")); return Err(Error::ParseError("Text element present twice for the same xml:lang."));
} }
} else if child.ns() == Some(ns::XMPP_STANZAS) { } else if child.ns() == Some(ns::XMPP_STANZAS) {