From 4ec92b16acff01004a7b6945234c36dc6e1b95e9 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 7 May 2017 15:23:06 +0100
Subject: [PATCH] Fix most clippy warnings.

---
 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(-)

diff --git a/src/jingle_s5b.rs b/src/jingle_s5b.rs
index b0d7266f42e16e5ad1c531ef08a7e32307407bfb..4c55d76583f9effa538dba86b11b9b405d90f028 100644
--- a/src/jingle_s5b.rs
+++ b/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
diff --git a/src/mam.rs b/src/mam.rs
index c831a0993d237fd9441101ad02a6fed5f9c7e8c6..640a3c042ae1dc61b675d3c5bb901b65a77fe5ca 100644
--- a/src/mam.rs
+++ b/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
diff --git a/src/message.rs b/src/message.rs
index e7972c3405c423eb30e3a93a7694b70c1340b5d7..bb8e8b46abe1f646265cbec0adf9dfc4155cad03 100644
--- a/src/message.rs
+++ b/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) {
diff --git a/src/presence.rs b/src/presence.rs
index cfaf5e71ab90caf5d6acf00fe377f7789f2265f4..f354d3101e4ced006933811e5feefcb12b765d45 100644
--- a/src/presence.rs
+++ b/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) {
diff --git a/src/stanza_error.rs b/src/stanza_error.rs
index 9a0bfa03dc71eb316580db86cc8f6a7bccb3152e..2f509ee21f6edb84cb1252104cafca57a5f8271f 100644
--- a/src/stanza_error.rs
+++ b/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) {