From d1d98ff3d58109f8ade63abd226994e30c5ef736 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 25 Sep 2019 10:28:44 +0200 Subject: [PATCH] Use crate::Element instead of minidom::Element. This makes refactoring much easier. --- src/attention.rs | 2 +- src/avatar.rs | 2 +- src/bind.rs | 2 +- src/blocking.rs | 2 +- src/bob.rs | 2 +- src/bookmarks.rs | 2 +- src/caps.rs | 2 +- src/carbons.rs | 2 +- src/cert_management.rs | 2 +- src/chatstates.rs | 2 +- src/component.rs | 2 +- src/csi.rs | 2 +- src/data_forms.rs | 2 +- src/delay.rs | 2 +- src/disco.rs | 2 +- src/ecaps2.rs | 2 +- src/eme.rs | 2 +- src/forwarding.rs | 2 +- src/hashes.rs | 2 +- src/ibb.rs | 2 +- src/ibr.rs | 2 +- src/idle.rs | 2 +- src/iq.rs | 2 +- src/jid_prep.rs | 2 +- src/jingle.rs | 2 +- src/jingle_dtls_srtp.rs | 2 +- src/jingle_ibb.rs | 2 +- src/jingle_ice_udp.rs | 2 +- src/jingle_message.rs | 2 +- src/jingle_rtp.rs | 2 +- src/jingle_s5b.rs | 2 +- src/media_element.rs | 2 +- src/message.rs | 2 +- src/message_correct.rs | 2 +- src/mood.rs | 2 +- src/muc/muc.rs | 2 +- src/muc/user.rs | 2 +- src/nick.rs | 2 +- src/occupant_id.rs | 2 +- src/ping.rs | 2 +- src/pubsub/event.rs | 2 +- src/pubsub/pubsub.rs | 2 +- src/receipts.rs | 2 +- src/roster.rs | 2 +- src/rsm.rs | 2 +- src/sasl.rs | 4 +-- src/sm.rs | 2 +- src/stanza_error.rs | 2 +- src/stanza_id.rs | 2 +- src/stream.rs | 2 +- src/time.rs | 2 +- src/tune.rs | 2 +- src/util/compare_elements.rs | 2 +- src/util/macros.rs | 62 ++++++++++++++++++------------------ src/version.rs | 2 +- src/websocket.rs | 2 +- 56 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/attention.rs b/src/attention.rs index a2af3a9c..83a871cc 100644 --- a/src/attention.rs +++ b/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] diff --git a/src/avatar.rs b/src/avatar.rs index 0940c33a..c475db82 100644 --- a/src/avatar.rs +++ b/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")] diff --git a/src/bind.rs b/src/bind.rs index 16fb487b..4da35641 100644 --- a/src/bind.rs +++ b/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; diff --git a/src/blocking.rs b/src/blocking.rs index 741d4340..1ddfa5c9 100644 --- a/src/blocking.rs +++ b/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!( diff --git a/src/bob.rs b/src/bob.rs index edb0c891..c78f6c34 100644 --- a/src/bob.rs +++ b/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; diff --git a/src/bookmarks.rs b/src/bookmarks.rs index c00195a5..900a3a91 100644 --- a/src/bookmarks.rs +++ b/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")] diff --git a/src/caps.rs b/src/caps.rs index 32f8f573..96ffa22a 100644 --- a/src/caps.rs +++ b/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}; diff --git a/src/carbons.rs b/src/carbons.rs index b40c1e2e..43047c2b 100644 --- a/src/carbons.rs +++ b/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")] diff --git a/src/cert_management.rs b/src/cert_management.rs index 7ed5ca7a..817a01bb 100644 --- a/src/cert_management.rs +++ b/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; diff --git a/src/chatstates.rs b/src/chatstates.rs index d7ae1e37..4d8f9a4d 100644 --- a/src/chatstates.rs +++ b/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] diff --git a/src/component.rs b/src/component.rs index a0588177..b8120ffd 100644 --- a/src/component.rs +++ b/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")] diff --git a/src/csi.rs b/src/csi.rs index 0465f94b..f3a9130d 100644 --- a/src/csi.rs +++ b/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; diff --git a/src/data_forms.rs b/src/data_forms.rs index 80c9131b..37f94dfa 100644 --- a/src/data_forms.rs +++ b/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!( diff --git a/src/delay.rs b/src/delay.rs index e987a4f0..e7c7449a 100644 --- a/src/delay.rs +++ b/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; diff --git a/src/disco.rs b/src/disco.rs index 857afaf8..040ce8c4 100644 --- a/src/disco.rs +++ b/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!( diff --git a/src/ecaps2.rs b/src/ecaps2.rs index 8722d065..cfcb340f 100644 --- a/src/ecaps2.rs +++ b/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")] diff --git a/src/eme.rs b/src/eme.rs index 623a0cd1..1014318e 100644 --- a/src/eme.rs +++ b/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")] diff --git a/src/forwarding.rs b/src/forwarding.rs index 5286323c..6517d22f 100644 --- a/src/forwarding.rs +++ b/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")] diff --git a/src/hashes.rs b/src/hashes.rs index 9987407a..ae7b61bc 100644 --- a/src/hashes.rs +++ b/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")] diff --git a/src/ibb.rs b/src/ibb.rs index 8a81b651..719fd853 100644 --- a/src/ibb.rs +++ b/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; diff --git a/src/ibr.rs b/src/ibr.rs index 8ced963f..b1b15286 100644 --- a/src/ibr.rs +++ b/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; diff --git a/src/idle.rs b/src/idle.rs index cba3698b..47d1c183 100644 --- a/src/idle.rs +++ b/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; diff --git a/src/iq.rs b/src/iq.rs index f3aa7f5d..64492616 100644 --- a/src/iq.rs +++ b/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; diff --git a/src/jid_prep.rs b/src/jid_prep.rs index ba8c9d84..5fbc0a0c 100644 --- a/src/jid_prep.rs +++ b/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; diff --git a/src/jingle.rs b/src/jingle.rs index 7e27ebbc..4c568bfc 100644 --- a/src/jingle.rs +++ b/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; diff --git a/src/jingle_dtls_srtp.rs b/src/jingle_dtls_srtp.rs index e65c3681..150388f6 100644 --- a/src/jingle_dtls_srtp.rs +++ b/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")] diff --git a/src/jingle_ibb.rs b/src/jingle_ibb.rs index d1fe61f9..f0fb90f0 100644 --- a/src/jingle_ibb.rs +++ b/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; diff --git a/src/jingle_ice_udp.rs b/src/jingle_ice_udp.rs index 32301438..51a725ee 100644 --- a/src/jingle_ice_udp.rs +++ b/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; diff --git a/src/jingle_message.rs b/src/jingle_message.rs index bf0478cf..78bf1db2 100644 --- a/src/jingle_message.rs +++ b/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 diff --git a/src/jingle_rtp.rs b/src/jingle_rtp.rs index 108010d0..5e686ca9 100644 --- a/src/jingle_rtp.rs +++ b/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")] diff --git a/src/jingle_s5b.rs b/src/jingle_s5b.rs index 17c5d996..b6df19ed 100644 --- a/src/jingle_s5b.rs +++ b/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; diff --git a/src/media_element.rs b/src/media_element.rs index f632e48c..099dadae 100644 --- a/src/media_element.rs +++ b/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; diff --git a/src/message.rs b/src/message.rs index 4a78c6c0..2c7eb299 100644 --- a/src/message.rs +++ b/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; diff --git a/src/message_correct.rs b/src/message_correct.rs index 1055af9b..374900f4 100644 --- a/src/message_correct.rs +++ b/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")] diff --git a/src/mood.rs b/src/mood.rs index f4b529c5..4270c588 100644 --- a/src/mood.rs +++ b/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")] diff --git a/src/muc/muc.rs b/src/muc/muc.rs index a4d13f8a..01688ec3 100644 --- a/src/muc/muc.rs +++ b/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; diff --git a/src/muc/user.rs b/src/muc/user.rs index d785d235..31157f76 100644 --- a/src/muc/user.rs +++ b/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!( diff --git a/src/nick.rs b/src/nick.rs index 07f07f77..20ae7a94 100644 --- a/src/nick.rs +++ b/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")] diff --git a/src/occupant_id.rs b/src/occupant_id.rs index 73065294..418a878b 100644 --- a/src/occupant_id.rs +++ b/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")] diff --git a/src/ping.rs b/src/ping.rs index be8ac48c..70663fa3 100644 --- a/src/ping.rs +++ b/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] diff --git a/src/pubsub/event.rs b/src/pubsub/event.rs index 30c118de..2228a067 100644 --- a/src/pubsub/event.rs +++ b/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 ``. diff --git a/src/pubsub/pubsub.rs b/src/pubsub/pubsub.rs index 875c1989..8faf9c43 100644 --- a/src/pubsub/pubsub.rs +++ b/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 diff --git a/src/receipts.rs b/src/receipts.rs index af40f641..e837a17f 100644 --- a/src/receipts.rs +++ b/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; diff --git a/src/roster.rs b/src/roster.rs index 6c871ba6..730da52d 100644 --- a/src/roster.rs +++ b/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; diff --git a/src/rsm.rs b/src/rsm.rs index 8299c9b6..169681d1 100644 --- a/src/rsm.rs +++ b/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 diff --git a/src/sasl.rs b/src/sasl.rs index e8f3aa6e..e3f09005 100644 --- a/src/sasl.rs +++ b/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 for Element { #[cfg(test)] mod tests { use super::*; - use minidom::Element; + use crate::Element; use std::convert::TryFrom; #[cfg(target_pointer_width = "32")] diff --git a/src/sm.rs b/src/sm.rs index b4835140..a78320f2 100644 --- a/src/sm.rs +++ b/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")] diff --git a/src/stanza_error.rs b/src/stanza_error.rs index 1f4dbbe1..0bdc2887 100644 --- a/src/stanza_error.rs +++ b/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; diff --git a/src/stanza_id.rs b/src/stanza_id.rs index bbbfb48f..1ba48f85 100644 --- a/src/stanza_id.rs +++ b/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; diff --git a/src/stream.rs b/src/stream.rs index e6f5be00..c1b5e1ea 100644 --- a/src/stream.rs +++ b/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")] diff --git a/src/time.rs b/src/time.rs index 601b3a4c..363cd210 100644 --- a/src/time.rs +++ b/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; diff --git a/src/tune.rs b/src/tune.rs index df9b6679..ed35357d 100644 --- a/src/tune.rs +++ b/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!( diff --git a/src/util/compare_elements.rs b/src/util/compare_elements.rs index df2e4157..7494be7b 100644 --- a/src/util/compare_elements.rs +++ b/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() { diff --git a/src/util/macros.rs b/src/util/macros.rs index fd7f58cc..107083a4 100644 --- a/src/util/macros.rs +++ b/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 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 { - fn from(elem: $elem) -> ::minidom::Element { - ::minidom::Element::builder( + impl From<$elem> for crate::Element { + fn from(elem: $elem) -> crate::Element { + 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 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 { - fn from(elem: $elem) -> ::minidom::Element { - ::minidom::Element::builder($name) + impl From<$elem> for crate::Element { + fn from(elem: $elem) -> crate::Element { + 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 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 { - fn from(_: $elem) -> ::minidom::Element { - ::minidom::Element::builder($name) + impl From<$elem> for crate::Element { + fn from(_: $elem) -> crate::Element { + 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 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 { - fn from(elem: $elem) -> ::minidom::Element { - ::minidom::Element::builder($name) + impl From<$elem> for crate::Element { + fn from(elem: $elem) -> crate::Element { + 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 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 { - fn from(elem: $elem) -> ::minidom::Element { - let mut builder = ::minidom::Element::builder($name) + impl From<$elem> for crate::Element { + fn from(elem: $elem) -> crate::Element { + let mut builder = crate::Element::builder($name) .ns(crate::ns::$ns); $( builder = builder.attr($attr_name, elem.$attr); diff --git a/src/version.rs b/src/version.rs index afc61789..028ce968 100644 --- a/src/version.rs +++ b/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")] diff --git a/src/websocket.rs b/src/websocket.rs index 1092423a..fbc1fb2b 100644 --- a/src/websocket.rs +++ b/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")]