Use crate::Element instead of minidom::Element.

This makes refactoring much easier.

src/attention.rs

@@ -20,7 +20,7 @@ mod tests {
     use super::*;
     #[cfg(not(feature = "disable-validation"))]
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[test]

src/avatar.rs

@@ -60,7 +60,7 @@ mod tests {
     use crate::hashes::Algo;
     #[cfg(not(feature = "disable-validation"))]
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/bind.rs

@@ -8,7 +8,7 @@ use crate::util::error::Error;
 use crate::iq::{IqResultPayload, IqSetPayload};
 use crate::ns;
 use jid::{FullJid, Jid};
-use minidom::Element;
+use crate::Element;
 use std::str::FromStr;
 use std::convert::TryFrom;
 

src/blocking.rs

@@ -8,7 +8,7 @@ use crate::util::error::Error;
 use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
 use crate::ns;
 use jid::Jid;
-use minidom::Element;
+use crate::Element;
 use std::convert::TryFrom;
 
 generate_empty_element!(

src/bob.rs

@@ -88,7 +88,7 @@ generate_element!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
     use std::error::Error as StdError;
 

src/bookmarks.rs

@@ -71,7 +71,7 @@ impl Storage {
 mod tests {
     use super::*;
     use crate::util::compare_elements::NamespaceAwareCompare;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/caps.rs

@@ -12,7 +12,7 @@ use crate::ns;
 use crate::presence::PresencePayload;
 use blake2::VarBlake2b;
 use digest::{Digest, Input, VariableOutput};
-use minidom::Element;
+use crate::Element;
 use sha1::Sha1;
 use sha2::{Sha256, Sha512};
 use sha3::{Sha3_256, Sha3_512};

src/carbons.rs

@@ -63,7 +63,7 @@ impl MessagePayload for Sent {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/cert_management.rs

@@ -113,7 +113,7 @@ impl IqSetPayload for Revoke {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
     use std::str::FromStr;
     use crate::ns;

src/chatstates.rs

@@ -34,7 +34,7 @@ mod tests {
     use super::*;
     use crate::util::error::Error;
     use crate::ns;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[test]

src/component.rs

@@ -43,7 +43,7 @@ impl Handshake {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/csi.rs

@@ -22,7 +22,7 @@ generate_empty_element!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
     use crate::ns;
 

src/data_forms.rs

@@ -7,7 +7,7 @@
 use crate::util::error::Error;
 use crate::media_element::MediaElement;
 use crate::ns;
-use minidom::Element;
+use crate::Element;
 use std::convert::TryFrom;
 
 generate_element!(

src/delay.rs

@@ -33,7 +33,7 @@ impl PresencePayload for Delay {}
 mod tests {
     use super::*;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::str::FromStr;
     use std::convert::TryFrom;
 

src/disco.rs

@@ -9,7 +9,7 @@ use crate::util::error::Error;
 use crate::iq::{IqGetPayload, IqResultPayload};
 use crate::ns;
 use jid::Jid;
-use minidom::Element;
+use crate::Element;
 use std::convert::TryFrom;
 
 generate_element!(

src/ecaps2.rs

@@ -174,7 +174,7 @@ pub fn query_ecaps2(hash: Hash) -> DiscoInfoQuery {
 mod tests {
     use super::*;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/eme.rs

@@ -25,7 +25,7 @@ impl MessagePayload for ExplicitMessageEncryption {}
 mod tests {
     use super::*;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/forwarding.rs

@@ -27,7 +27,7 @@ generate_element!(
 mod tests {
     use super::*;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/hashes.rs

@@ -191,7 +191,7 @@ impl Deref for Sha1HexAttribute {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/ibb.rs

@@ -73,7 +73,7 @@ impl IqSetPayload for Close {}
 mod tests {
     use super::*;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::error::Error as StdError;
     use std::convert::TryFrom;
 

src/ibr.rs

@@ -8,7 +8,7 @@ use crate::data_forms::DataForm;
 use crate::util::error::Error;
 use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
 use crate::ns;
-use minidom::Element;
+use crate::Element;
 use std::collections::HashMap;
 use std::convert::TryFrom;
 

src/idle.rs

@@ -22,7 +22,7 @@ impl PresencePayload for Idle {}
 mod tests {
     use super::*;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::error::Error as StdError;
     use std::str::FromStr;
     use std::convert::TryFrom;

src/iq.rs

@@ -9,7 +9,7 @@ use crate::util::error::Error;
 use crate::ns;
 use crate::stanza_error::StanzaError;
 use jid::Jid;
-use minidom::Element;
+use crate::Element;
 use minidom::IntoAttributeValue;
 use std::convert::TryFrom;
 

src/jid_prep.rs

@@ -42,7 +42,7 @@ impl IqResultPayload for JidPrepResponse {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
     use std::str::FromStr;
 

src/jingle.rs

@@ -8,7 +8,7 @@ use crate::util::error::Error;
 use crate::iq::IqSetPayload;
 use crate::ns;
 use jid::Jid;
-use minidom::Element;
+use crate::Element;
 use std::collections::BTreeMap;
 use std::str::FromStr;
 use std::convert::TryFrom;

src/jingle_dtls_srtp.rs

@@ -49,7 +49,7 @@ generate_element!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/jingle_ibb.rs

@@ -25,7 +25,7 @@ attributes: [
 mod tests {
     use super::*;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::error::Error as StdError;
     use std::convert::TryFrom;
 

src/jingle_ice_udp.rs

@@ -91,7 +91,7 @@ generate_element!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
     use crate::hashes::Algo;
     use crate::jingle_dtls_srtp::Setup;

src/jingle_message.rs

@@ -7,7 +7,7 @@
 use crate::util::error::Error;
 use crate::jingle::SessionId;
 use crate::ns;
-use minidom::Element;
+use crate::Element;
 use std::convert::TryFrom;
 
 /// Defines a protocol for broadcasting Jingle requests to all of the clients

src/jingle_rtp.rs

@@ -75,7 +75,7 @@ generate_element!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/jingle_s5b.rs

@@ -7,7 +7,7 @@
 use crate::util::error::Error;
 use crate::ns;
 use jid::Jid;
-use minidom::Element;
+use crate::Element;
 use std::net::IpAddr;
 use std::convert::TryFrom;
 

src/media_element.rs

@@ -47,7 +47,7 @@ mod tests {
     use super::*;
     use crate::data_forms::DataForm;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::error::Error as StdError;
     use std::convert::TryFrom;
 

src/message.rs

@@ -7,7 +7,7 @@
 use crate::util::error::Error;
 use crate::ns;
 use jid::Jid;
-use minidom::Element;
+use crate::Element;
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 

src/message_correct.rs

@@ -22,7 +22,7 @@ impl MessagePayload for Replace {}
 mod tests {
     use super::*;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/mood.rs

@@ -271,7 +271,7 @@ generate_elem_id!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/muc/muc.rs

@@ -96,7 +96,7 @@ mod tests {
     use super::*;
     use crate::util::compare_elements::NamespaceAwareCompare;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::str::FromStr;
     use std::convert::TryFrom;
 

src/muc/user.rs

@@ -8,7 +8,7 @@
 use crate::util::error::Error;
 use crate::ns;
 use jid::FullJid;
-use minidom::Element;
+use crate::Element;
 use std::convert::TryFrom;
 
 generate_attribute_enum!(

src/nick.rs

@@ -16,7 +16,7 @@ mod tests {
     use super::*;
     #[cfg(not(feature = "disable-validation"))]
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/occupant_id.rs

@@ -27,7 +27,7 @@ impl PresencePayload for OccupantId {}
 mod tests {
     use super::*;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/ping.rs

@@ -22,7 +22,7 @@ mod tests {
     use super::*;
     #[cfg(not(feature = "disable-validation"))]
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[test]

src/pubsub/event.rs

@@ -10,7 +10,7 @@ use crate::util::error::Error;
 use crate::ns;
 use crate::pubsub::{ItemId, NodeName, Subscription, SubscriptionId, Item as PubSubItem};
 use jid::Jid;
-use minidom::Element;
+use crate::Element;
 use std::convert::TryFrom;
 
 /// Event wrapper for a PubSub `<item/>`.

src/pubsub/pubsub.rs

@@ -10,7 +10,7 @@ use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
 use crate::ns;
 use crate::pubsub::{NodeName, Subscription, SubscriptionId, Item as PubSubItem};
 use jid::Jid;
-use minidom::Element;
+use crate::Element;
 use std::convert::TryFrom;
 
 // TODO: a better solution would be to split this into a query and a result elements, like for

src/receipts.rs

@@ -32,7 +32,7 @@ impl MessagePayload for Received {}
 mod tests {
     use super::*;
     use crate::ns;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
     use crate::util::error::Error;
 

src/roster.rs

@@ -94,7 +94,7 @@ mod tests {
     use super::*;
     use crate::util::compare_elements::NamespaceAwareCompare;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::str::FromStr;
     use std::convert::TryFrom;
 

src/rsm.rs

@@ -6,7 +6,7 @@
 
 use crate::util::error::Error;
 use crate::ns;
-use minidom::Element;
+use crate::Element;
 use std::convert::TryFrom;
 
 /// Requests paging through a potentially big set of items (represented by an

src/sasl.rs

@@ -7,7 +7,7 @@
 use crate::util::error::Error;
 use crate::util::helpers::Base64;
 use crate::ns;
-use minidom::Element;
+use crate::Element;
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 
@@ -221,7 +221,7 @@ impl From<Failure> for Element {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/sm.rs

@@ -145,7 +145,7 @@ generate_empty_element!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/stanza_error.rs

@@ -9,7 +9,7 @@ use crate::message::MessagePayload;
 use crate::ns;
 use crate::presence::PresencePayload;
 use jid::Jid;
-use minidom::Element;
+use crate::Element;
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 

src/stanza_id.rs

@@ -38,7 +38,7 @@ impl MessagePayload for OriginId {}
 mod tests {
     use super::*;
     use crate::util::error::Error;
-    use minidom::Element;
+    use crate::Element;
     use std::str::FromStr;
     use std::convert::TryFrom;
 

src/stream.rs

@@ -73,7 +73,7 @@ impl Stream {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/time.rs

@@ -9,7 +9,7 @@ use crate::date::DateTime;
 use crate::iq::{IqGetPayload, IqResultPayload};
 use crate::ns;
 use crate::util::error::Error;
-use minidom::Element;
+use crate::Element;
 use std::convert::TryFrom;
 use std::str::FromStr;
 

src/tune.rs

@@ -7,7 +7,7 @@
 use crate::util::error::Error;
 use crate::pubsub::PubSubPayload;
 use crate::ns;
-use minidom::Element;
+use crate::Element;
 use std::convert::TryFrom;
 
 generate_elem_id!(

src/util/compare_elements.rs

@@ -51,7 +51,7 @@ impl NamespaceAwareCompare for Element {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
 
     #[test]
     fn simple() {

src/util/macros.rs

@@ -230,9 +230,9 @@ macro_rules! generate_element_enum {
                 $enum
             ),+
         }
-        impl ::std::convert::TryFrom<::minidom::Element> for $elem {
+        impl ::std::convert::TryFrom<crate::Element> for $elem {
             type Error = crate::util::error::Error;
-            fn try_from(elem: ::minidom::Element) -> Result<$elem, crate::util::error::Error> {
+            fn try_from(elem: crate::Element) -> Result<$elem, crate::util::error::Error> {
                 check_ns_only!(elem, $name, $ns);
                 check_no_children!(elem, $name);
                 check_no_attributes!(elem, $name);
@@ -242,9 +242,9 @@ macro_rules! generate_element_enum {
                 })
             }
         }
-        impl From<$elem> for ::minidom::Element {
+        impl From<$elem> for crate::Element {
-            fn from(elem: $elem) -> ::minidom::Element {
+            fn from(elem: $elem) -> crate::Element {
-                ::minidom::Element::builder(
+                crate::Element::builder(
                     match elem {
                         $($elem::$enum => $enum_name,)+
                     }
@@ -274,9 +274,9 @@ macro_rules! generate_attribute_enum {
                 $enum
             ),+
         }
-        impl ::std::convert::TryFrom<::minidom::Element> for $elem {
+        impl ::std::convert::TryFrom<crate::Element> for $elem {
             type Error = crate::util::error::Error;
-            fn try_from(elem: ::minidom::Element) -> Result<$elem, crate::util::error::Error> {
+            fn try_from(elem: crate::Element) -> Result<$elem, crate::util::error::Error> {
                 check_ns_only!(elem, $name, $ns);
                 check_no_children!(elem, $name);
                 check_no_unknown_attributes!(elem, $name, [$attr]);
@@ -286,9 +286,9 @@ macro_rules! generate_attribute_enum {
                 })
             }
         }
-        impl From<$elem> for ::minidom::Element {
+        impl From<$elem> for crate::Element {
-            fn from(elem: $elem) -> ::minidom::Element {
+            fn from(elem: $elem) -> crate::Element {
-                ::minidom::Element::builder($name)
+                crate::Element::builder($name)
                     .ns(crate::ns::$ns)
                     .attr($attr, match elem {
                          $($elem::$enum => $enum_name,)+
@@ -377,10 +377,10 @@ macro_rules! generate_empty_element {
         #[derive(Debug, Clone)]
         pub struct $elem;
 
-        impl ::std::convert::TryFrom<::minidom::Element> for $elem {
+        impl ::std::convert::TryFrom<crate::Element> for $elem {
             type Error = crate::util::error::Error;
 
-            fn try_from(elem: ::minidom::Element) -> Result<$elem, crate::util::error::Error> {
+            fn try_from(elem: crate::Element) -> Result<$elem, crate::util::error::Error> {
                 check_self!(elem, $name, $ns);
                 check_no_children!(elem, $name);
                 check_no_attributes!(elem, $name);
@@ -388,9 +388,9 @@ macro_rules! generate_empty_element {
             }
         }
 
-        impl From<$elem> for ::minidom::Element {
+        impl From<$elem> for crate::Element {
-            fn from(_: $elem) -> ::minidom::Element {
+            fn from(_: $elem) -> crate::Element {
-                ::minidom::Element::builder($name)
+                crate::Element::builder($name)
                     .ns(crate::ns::$ns)
                     .build()
             }
@@ -439,9 +439,9 @@ macro_rules! generate_elem_id {
         $(#[$meta])*
         #[derive(Debug, Clone, PartialEq, Eq, Hash)]
         pub struct $elem(pub $type);
-        impl ::std::convert::TryFrom<::minidom::Element> for $elem {
+        impl ::std::convert::TryFrom<crate::Element> for $elem {
             type Error = crate::util::error::Error;
-            fn try_from(elem: ::minidom::Element) -> Result<$elem, crate::util::error::Error> {
+            fn try_from(elem: crate::Element) -> Result<$elem, crate::util::error::Error> {
                 check_self!(elem, $name, $ns);
                 check_no_children!(elem, $name);
                 check_no_attributes!(elem, $name);
@@ -449,9 +449,9 @@ macro_rules! generate_elem_id {
                 Ok($elem(elem.text().parse()?))
             }
         }
-        impl From<$elem> for ::minidom::Element {
+        impl From<$elem> for crate::Element {
-            fn from(elem: $elem) -> ::minidom::Element {
+            fn from(elem: $elem) -> crate::Element {
-                ::minidom::Element::builder($name)
+                crate::Element::builder($name)
                     .ns(crate::ns::$ns)
                     .append(elem.0.to_string())
                     .build()
@@ -592,14 +592,14 @@ macro_rules! finish_parse_elem {
 macro_rules! generate_serialiser {
     ($builder:ident, $parent:ident, $elem:ident, Required, String, ($name:tt, $ns:ident)) => {
         $builder.append(
-            ::minidom::Element::builder($name)
+            crate::Element::builder($name)
                 .ns(crate::ns::$ns)
                 .append(::minidom::Node::Text($parent.$elem))
         )
     };
     ($builder:ident, $parent:ident, $elem:ident, Option, String, ($name:tt, $ns:ident)) => {
         $builder.append_all($parent.$elem.map(|elem| {
-                ::minidom::Element::builder($name)
+                crate::Element::builder($name)
                     .ns(crate::ns::$ns)
                     .append(::minidom::Node::Text(elem))
             })
@@ -607,9 +607,9 @@ macro_rules! generate_serialiser {
     };
     ($builder:ident, $parent:ident, $elem:ident, Option, $constructor:ident, ($name:tt, $ns:ident)) => {
         $builder.append_all($parent.$elem.map(|elem| {
-                ::minidom::Element::builder($name)
+                crate::Element::builder($name)
                     .ns(crate::ns::$ns)
-                    .append(::minidom::Node::Element(::minidom::Element::from(elem)))
+                    .append(::minidom::Node::Element(crate::Element::from(elem)))
             })
         )
     };
@@ -617,10 +617,10 @@ macro_rules! generate_serialiser {
         $builder.append_all($parent.$elem.into_iter())
     };
     ($builder:ident, $parent:ident, $elem:ident, Present, $constructor:ident, ($name:tt, $ns:ident)) => {
-        $builder.append(::minidom::Node::Element(::minidom::Element::builder($name).ns(crate::ns::$ns).build()))
+        $builder.append(::minidom::Node::Element(crate::Element::builder($name).ns(crate::ns::$ns).build()))
     };
     ($builder:ident, $parent:ident, $elem:ident, $_:ident, $constructor:ident, ($name:tt, $ns:ident)) => {
-        $builder.append(::minidom::Node::Element(::minidom::Element::from($parent.$elem)))
+        $builder.append(::minidom::Node::Element(crate::Element::from($parent.$elem)))
     };
 }
 
@@ -661,10 +661,10 @@ macro_rules! generate_element {
             )*
         }
 
-        impl ::std::convert::TryFrom<::minidom::Element> for $elem {
+        impl ::std::convert::TryFrom<crate::Element> for $elem {
             type Error = crate::util::error::Error;
 
-            fn try_from(elem: ::minidom::Element) -> Result<$elem, crate::util::error::Error> {
+            fn try_from(elem: crate::Element) -> Result<$elem, crate::util::error::Error> {
                 check_self!(elem, $name, $ns);
                 check_no_unknown_attributes!(elem, $name, [$($attr_name),*]);
                 $(
@@ -693,9 +693,9 @@ macro_rules! generate_element {
             }
         }
 
-        impl From<$elem> for ::minidom::Element {
+        impl From<$elem> for crate::Element {
-            fn from(elem: $elem) -> ::minidom::Element {
+            fn from(elem: $elem) -> crate::Element {
-                let mut builder = ::minidom::Element::builder($name)
+                let mut builder = crate::Element::builder($name)
                     .ns(crate::ns::$ns);
                 $(
                     builder = builder.attr($attr_name, elem.$attr);

src/version.rs

@@ -42,7 +42,7 @@ impl IqResultPayload for VersionResult {}
 mod tests {
     use super::*;
     use crate::util::compare_elements::NamespaceAwareCompare;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]

src/websocket.rs

@@ -72,7 +72,7 @@ impl Open {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
+    use crate::Element;
     use std::convert::TryFrom;
 
     #[cfg(target_pointer_width = "32")]