From 0d4327eb42511fb9655764d845dc5a921a0851f9 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Mon, 14 May 2018 16:12:56 +0200 Subject: [PATCH] macros: Remove use requirement on minidom::IntoAttributeValue. --- src/data_forms.rs | 2 +- src/ibb.rs | 2 +- src/jingle.rs | 2 +- src/jingle_ft.rs | 2 +- src/jingle_ibb.rs | 2 +- src/jingle_s5b.rs | 2 +- src/macros.rs | 6 +++--- src/mam.rs | 2 +- src/message.rs | 2 +- src/muc/user.rs | 2 +- src/pubsub/event.rs | 2 +- src/roster.rs | 2 +- src/sasl.rs | 2 +- src/stanza_error.rs | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/data_forms.rs b/src/data_forms.rs index 1e297409..74985edf 100644 --- a/src/data_forms.rs +++ b/src/data_forms.rs @@ -6,7 +6,7 @@ use try_from::TryFrom; -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use error::Error; use ns; diff --git a/src/ibb.rs b/src/ibb.rs index d5188177..3471715b 100644 --- a/src/ibb.rs +++ b/src/ibb.rs @@ -4,7 +4,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use error::Error; diff --git a/src/jingle.rs b/src/jingle.rs index 08002bcf..1b89dae7 100644 --- a/src/jingle.rs +++ b/src/jingle.rs @@ -7,7 +7,7 @@ use try_from::TryFrom; use std::str::FromStr; -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use jid::Jid; use error::Error; diff --git a/src/jingle_ft.rs b/src/jingle_ft.rs index 788ff22f..e2539f99 100644 --- a/src/jingle_ft.rs +++ b/src/jingle_ft.rs @@ -13,7 +13,7 @@ use hashes::Hash; use jingle::{Creator, ContentId}; use date::DateTime; -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use error::Error; use ns; diff --git a/src/jingle_ibb.rs b/src/jingle_ibb.rs index 2cf0fb44..2f6d0b15 100644 --- a/src/jingle_ibb.rs +++ b/src/jingle_ibb.rs @@ -4,7 +4,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use error::Error; diff --git a/src/jingle_s5b.rs b/src/jingle_s5b.rs index 7ef0bbd2..4e8ca817 100644 --- a/src/jingle_s5b.rs +++ b/src/jingle_s5b.rs @@ -7,7 +7,7 @@ use try_from::TryFrom; use std::net::IpAddr; -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use jid::Jid; use error::Error; diff --git a/src/macros.rs b/src/macros.rs index 0a056f8d..45b5c056 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -60,7 +60,7 @@ macro_rules! generate_attribute { }) } } - impl IntoAttributeValue for $elem { + impl ::minidom::IntoAttributeValue for $elem { fn into_attribute_value(self) -> Option { Some(String::from(match self { $($elem::$a => $b),+ @@ -86,7 +86,7 @@ macro_rules! generate_attribute { }) } } - impl IntoAttributeValue for $elem { + impl ::minidom::IntoAttributeValue for $elem { #[allow(unreachable_patterns)] fn into_attribute_value(self) -> Option { Some(String::from(match self { @@ -305,7 +305,7 @@ macro_rules! generate_id { Ok($elem(String::from(s))) } } - impl IntoAttributeValue for $elem { + impl ::minidom::IntoAttributeValue for $elem { fn into_attribute_value(self) -> Option { Some(self.0) } diff --git a/src/mam.rs b/src/mam.rs index 115daf65..6af739d9 100644 --- a/src/mam.rs +++ b/src/mam.rs @@ -6,7 +6,7 @@ use try_from::TryFrom; -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use jid::Jid; use error::Error; diff --git a/src/message.rs b/src/message.rs index 36d09a7c..72fcbde4 100644 --- a/src/message.rs +++ b/src/message.rs @@ -7,7 +7,7 @@ use try_from::TryFrom; use std::collections::BTreeMap; -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use jid::Jid; diff --git a/src/muc/user.rs b/src/muc/user.rs index 1c3d2cc9..33b20d87 100644 --- a/src/muc/user.rs +++ b/src/muc/user.rs @@ -7,7 +7,7 @@ use try_from::{TryFrom, TryInto}; -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use jid::Jid; diff --git a/src/pubsub/event.rs b/src/pubsub/event.rs index 1d478cad..13648956 100644 --- a/src/pubsub/event.rs +++ b/src/pubsub/event.rs @@ -6,7 +6,7 @@ use try_from::TryFrom; -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use jid::Jid; use date::DateTime; diff --git a/src/roster.rs b/src/roster.rs index 54847e02..96d39586 100644 --- a/src/roster.rs +++ b/src/roster.rs @@ -4,7 +4,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use jid::Jid; use error::Error; diff --git a/src/sasl.rs b/src/sasl.rs index c53eba2f..e7a22632 100644 --- a/src/sasl.rs +++ b/src/sasl.rs @@ -4,7 +4,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use error::Error; diff --git a/src/stanza_error.rs b/src/stanza_error.rs index 79386252..5d26fa25 100644 --- a/src/stanza_error.rs +++ b/src/stanza_error.rs @@ -7,7 +7,7 @@ use try_from::TryFrom; use std::collections::BTreeMap; -use minidom::{Element, IntoAttributeValue}; +use minidom::Element; use error::Error; use jid::Jid;