diff --git a/instant-xml-macros/src/de.rs b/instant-xml-macros/src/de.rs index 3f7aba4..2328594 100644 --- a/instant-xml-macros/src/de.rs +++ b/instant-xml-macros/src/de.rs @@ -218,7 +218,7 @@ impl Deserializer { )); out.extend(quote!( - const TAG_NAME: ::instant_xml::TagName<'xml> = ::instant_xml::TagName::Custom(#name); + const TAG_NAME: ::instant_xml::TagName = ::instant_xml::TagName::Custom(#name); )); out = quote!( diff --git a/instant-xml/src/impls.rs b/instant-xml/src/impls.rs index c6d09ff..f0bf7af 100644 --- a/instant-xml/src/impls.rs +++ b/instant-xml/src/impls.rs @@ -38,7 +38,7 @@ impl<'xml> Visitor<'xml> for BoolVisitor { } impl<'xml> FromXml<'xml> for bool { - const TAG_NAME: TagName<'xml> = TagName::FieldName; + const TAG_NAME: TagName = TagName::FieldName; fn deserialize(deserializer: &mut Deserializer) -> Result { match deserializer.consume_next_type() { @@ -114,7 +114,7 @@ where macro_rules! from_xml_for_number { ($typ:ty) => { impl<'xml> FromXml<'xml> for $typ { - const TAG_NAME: TagName<'xml> = TagName::FieldName; + const TAG_NAME: TagName = TagName::FieldName; fn deserialize(deserializer: &mut Deserializer) -> Result { match deserializer.consume_next_type() { @@ -154,7 +154,7 @@ impl<'xml> Visitor<'xml> for StringVisitor { } impl<'xml> FromXml<'xml> for String { - const TAG_NAME: TagName<'xml> = TagName::FieldName; + const TAG_NAME: TagName = TagName::FieldName; fn deserialize(deserializer: &mut Deserializer) -> Result { //<&'xml str>::deserialize(deserializer); @@ -179,7 +179,7 @@ impl<'xml> Visitor<'xml> for CharVisitor { } impl<'xml> FromXml<'xml> for char { - const TAG_NAME: TagName<'xml> = TagName::FieldName; + const TAG_NAME: TagName = TagName::FieldName; fn deserialize(deserializer: &mut Deserializer) -> Result { match deserializer.consume_next_type() { @@ -203,7 +203,7 @@ impl<'a> Visitor<'a> for StrVisitor { } impl<'xml> FromXml<'xml> for &'xml str { - const TAG_NAME: TagName<'xml> = TagName::FieldName; + const TAG_NAME: TagName = TagName::FieldName; fn deserialize(deserializer: &mut Deserializer<'xml>) -> Result { match deserializer.consume_next_type() { @@ -224,7 +224,7 @@ impl<'a> Visitor<'a> for CowStrVisitor { } impl<'xml> FromXml<'xml> for Cow<'xml, str> { - const TAG_NAME: TagName<'xml> = <&str>::TAG_NAME; + const TAG_NAME: TagName = <&str>::TAG_NAME; fn deserialize(deserializer: &mut Deserializer<'xml>) -> Result { match deserializer.consume_next_type() { @@ -238,7 +238,7 @@ impl<'xml, T> FromXml<'xml> for Option where T: FromXml<'xml>, { - const TAG_NAME: TagName<'xml> = ::TAG_NAME; + const TAG_NAME: TagName = ::TAG_NAME; fn deserialize(deserializer: &mut Deserializer<'xml>) -> Result { match ::deserialize(deserializer) { diff --git a/instant-xml/src/lib.rs b/instant-xml/src/lib.rs index acc4d57..43c0fe8 100644 --- a/instant-xml/src/lib.rs +++ b/instant-xml/src/lib.rs @@ -179,13 +179,13 @@ pub enum EntityType { Attribute, } -pub enum TagName<'xml> { +pub enum TagName { FieldName, - Custom(&'xml str), + Custom(&'static str), } pub trait FromXml<'xml>: Sized { - const TAG_NAME: TagName<'xml>; + const TAG_NAME: TagName; fn from_xml(input: &'xml str) -> Result { let mut deserializer = Deserializer::new(input);