Fix most clippy warnings.

Emmanuel Gil Peyrot created 8 years ago

Change summary

src/jingle_s5b.rs   | 8 ++++----
src/mam.rs          | 5 +----
src/message.rs      | 4 ++--
src/presence.rs     | 2 +-
src/stanza_error.rs | 2 +-
5 files changed, 9 insertions(+), 12 deletions(-)

Detailed changes

src/jingle_s5b.rs

@@ -182,7 +182,7 @@ impl<'a> TryFrom<&'a Element> for Transport {
                     });
                     TransportPayload::Candidates(candidates)
                 } 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."));
                     }
                     let cid = child.attr("cid")
@@ -190,12 +190,12 @@ impl<'a> TryFrom<&'a Element> for Transport {
                                    .parse()?;
                     TransportPayload::Activated(cid)
                 } 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."));
                     }
                     TransportPayload::CandidateError
                 } 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."));
                     }
                     let cid = child.attr("cid")
@@ -203,7 +203,7 @@ impl<'a> TryFrom<&'a Element> for Transport {
                                    .parse()?;
                     TransportPayload::CandidateUsed(cid)
                 } 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."));
                     }
                     TransportPayload::ProxyError

src/mam.rs

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

src/message.rs

@@ -129,7 +129,7 @@ impl<'a> TryFrom<&'a Element> for Message {
                     return Err(Error::ParseError("Unknown child in body element."));
                 }
                 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."));
                 }
             } 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."));
                 }
                 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."));
                 }
             } else if elem.is("thread", ns::JABBER_CLIENT) {

src/presence.rs

@@ -170,7 +170,7 @@ impl<'a> TryFrom<&'a Element> for Presence {
                     return Err(Error::ParseError("Unknown child in status element."));
                 }
                 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."));
                 }
             } else if elem.is("priority", ns::JABBER_CLIENT) {

src/stanza_error.rs

@@ -173,7 +173,7 @@ impl<'a> TryFrom<&'a Element> for StanzaError {
                     return Err(Error::ParseError("Unknown element in error text."));
                 }
                 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."));
                 }
             } else if child.ns() == Some(ns::XMPP_STANZAS) {