From f69f567448af99c71cb76bf5e80828468740674a Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 27 Aug 2017 01:04:56 +0100
Subject: [PATCH] =?UTF-8?q?Use=20minidom=C2=A00.6.1=E2=80=99s=20Element::h?=
 =?UTF-8?q?as=5Fns(),=20to=20simplify=20namespace=20comparisons.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/chatstates.rs     | 3 +--
 src/jingle.rs         | 3 +--
 src/jingle_message.rs | 3 +--
 src/stanza_error.rs   | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/chatstates.rs b/src/chatstates.rs
index 9a63a28d23fbcf4fab8e150c46212f1dd91a1f7d..ecbecdffc4135dbfe7b50aa68aafbb57a9e5402e 100644
--- a/src/chatstates.rs
+++ b/src/chatstates.rs
@@ -38,8 +38,7 @@ impl TryFrom<Element> for ChatState {
     type Err = Error;
 
     fn try_from(elem: Element) -> Result<ChatState, Error> {
-        let ns = elem.ns();
-        if ns.as_ref().map(|ns| ns.as_str()) != Some(ns::CHATSTATES) {
+        if !elem.has_ns(ns::CHATSTATES) {
             return Err(Error::ParseError("This is not a chatstate element."));
         }
         for _ in elem.children() {
diff --git a/src/jingle.rs b/src/jingle.rs
index d20ed056c5053f36b76b18a7e95dcf03cba47b37..9d142612e5b74a15606dd8d525556d4a706fe580 100644
--- a/src/jingle.rs
+++ b/src/jingle.rs
@@ -208,8 +208,7 @@ impl TryFrom<Element> for ReasonElement {
         let mut reason = None;
         let mut text = None;
         for child in elem.children() {
-            let child_ns = child.ns();
-            if child_ns.as_ref().map(|ns| ns.as_str()) != Some(ns::JINGLE) {
+            if !child.has_ns(ns::JINGLE) {
                 return Err(Error::ParseError("Reason contains a foreign element."));
             }
             match child.name() {
diff --git a/src/jingle_message.rs b/src/jingle_message.rs
index 57cebe8012e097b401d199441aa76c05ea6a729d..779af992d0b43f06b7f7b5104301a95966421cdd 100644
--- a/src/jingle_message.rs
+++ b/src/jingle_message.rs
@@ -47,8 +47,7 @@ impl TryFrom<Element> for JingleMI {
     type Err = Error;
 
     fn try_from(elem: Element) -> Result<JingleMI, Error> {
-        let ns = elem.ns();
-        if ns.as_ref().map(|ns| ns.as_str()) != Some(ns::JINGLE_MESSAGE) {
+        if !elem.has_ns(ns::JINGLE_MESSAGE) {
             return Err(Error::ParseError("This is not a Jingle message element."));
         }
         Ok(match elem.name() {
diff --git a/src/stanza_error.rs b/src/stanza_error.rs
index 1ed542c14239bdf9d44eccffefd2109f303a7afc..bbc31623bcf98827e438b2470255887de90c1096 100644
--- a/src/stanza_error.rs
+++ b/src/stanza_error.rs
@@ -136,7 +136,6 @@ impl TryFrom<Element> for StanzaError {
         let mut other = None;
 
         for child in elem.children() {
-            let child_ns = child.ns();
             if child.is("text", ns::XMPP_STANZAS) {
                 for _ in child.children() {
                     return Err(Error::ParseError("Unknown element in error text."));
@@ -145,7 +144,7 @@ impl TryFrom<Element> for StanzaError {
                 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.as_ref().map(|ns| ns.as_str()) == Some(ns::XMPP_STANZAS) {
+            } else if child.has_ns(ns::XMPP_STANZAS) {
                 if defined_condition.is_some() {
                     return Err(Error::ParseError("Error must not have more than one defined-condition."));
                 }