macros: Remove use requirement on minidom::IntoAttributeValue.
This commit is contained in:
parent
040792c242
commit
0d4327eb42
14 changed files with 16 additions and 16 deletions
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
use try_from::TryFrom;
|
use try_from::TryFrom;
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
use ns;
|
use ns;
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
// 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/.
|
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
use try_from::TryFrom;
|
use try_from::TryFrom;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
use jid::Jid;
|
use jid::Jid;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ use hashes::Hash;
|
||||||
use jingle::{Creator, ContentId};
|
use jingle::{Creator, ContentId};
|
||||||
use date::DateTime;
|
use date::DateTime;
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
use ns;
|
use ns;
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
// 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/.
|
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
use try_from::TryFrom;
|
use try_from::TryFrom;
|
||||||
use std::net::IpAddr;
|
use std::net::IpAddr;
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
use jid::Jid;
|
use jid::Jid;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ macro_rules! generate_attribute {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl IntoAttributeValue for $elem {
|
impl ::minidom::IntoAttributeValue for $elem {
|
||||||
fn into_attribute_value(self) -> Option<String> {
|
fn into_attribute_value(self) -> Option<String> {
|
||||||
Some(String::from(match self {
|
Some(String::from(match self {
|
||||||
$($elem::$a => $b),+
|
$($elem::$a => $b),+
|
||||||
|
|
@ -86,7 +86,7 @@ macro_rules! generate_attribute {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl IntoAttributeValue for $elem {
|
impl ::minidom::IntoAttributeValue for $elem {
|
||||||
#[allow(unreachable_patterns)]
|
#[allow(unreachable_patterns)]
|
||||||
fn into_attribute_value(self) -> Option<String> {
|
fn into_attribute_value(self) -> Option<String> {
|
||||||
Some(String::from(match self {
|
Some(String::from(match self {
|
||||||
|
|
@ -305,7 +305,7 @@ macro_rules! generate_id {
|
||||||
Ok($elem(String::from(s)))
|
Ok($elem(String::from(s)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl IntoAttributeValue for $elem {
|
impl ::minidom::IntoAttributeValue for $elem {
|
||||||
fn into_attribute_value(self) -> Option<String> {
|
fn into_attribute_value(self) -> Option<String> {
|
||||||
Some(self.0)
|
Some(self.0)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
use try_from::TryFrom;
|
use try_from::TryFrom;
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
use jid::Jid;
|
use jid::Jid;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
use try_from::TryFrom;
|
use try_from::TryFrom;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
|
|
||||||
use jid::Jid;
|
use jid::Jid;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
use try_from::{TryFrom, TryInto};
|
use try_from::{TryFrom, TryInto};
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
|
|
||||||
use jid::Jid;
|
use jid::Jid;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
use try_from::TryFrom;
|
use try_from::TryFrom;
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
use jid::Jid;
|
use jid::Jid;
|
||||||
use date::DateTime;
|
use date::DateTime;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
// 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/.
|
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
use jid::Jid;
|
use jid::Jid;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
// 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/.
|
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
use try_from::TryFrom;
|
use try_from::TryFrom;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
use minidom::{Element, IntoAttributeValue};
|
use minidom::Element;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
use jid::Jid;
|
use jid::Jid;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue