instant-labs
/
instant-xml
mirror of https://github.com/instant-labs/instant-xml.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use &'static str in TagName

This commit is contained in:
Dirkjan Ochtman 2022-09-01 12:31:20 +02:00
parent 14746d9854
commit 4563ec0db6
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instant-xml-macros/src/de.rs
View File

@ -218,7 +218,7 @@ impl Deserializer {
)); ));
out.extend(quote!( 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!( out = quote!(

14
instant-xml/src/impls.rs
View File

@ -38,7 +38,7 @@ impl<'xml> Visitor<'xml> for BoolVisitor {
} }
impl<'xml> FromXml<'xml> for bool { 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<Self, Error> { fn deserialize(deserializer: &mut Deserializer) -> Result<Self, Error> {
match deserializer.consume_next_type() { match deserializer.consume_next_type() {
@ -114,7 +114,7 @@ where
macro_rules! from_xml_for_number { macro_rules! from_xml_for_number {
($typ:ty) => { ($typ:ty) => {
impl<'xml> FromXml<'xml> for $typ { 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<Self, Error> { fn deserialize(deserializer: &mut Deserializer) -> Result<Self, Error> {
match deserializer.consume_next_type() { match deserializer.consume_next_type() {
@ -154,7 +154,7 @@ impl<'xml> Visitor<'xml> for StringVisitor {
} }
impl<'xml> FromXml<'xml> for String { 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<Self, Error> { fn deserialize(deserializer: &mut Deserializer) -> Result<Self, Error> {
//<&'xml str>::deserialize(deserializer); //<&'xml str>::deserialize(deserializer);
@ -179,7 +179,7 @@ impl<'xml> Visitor<'xml> for CharVisitor {
} }
impl<'xml> FromXml<'xml> for char { 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<Self, Error> { fn deserialize(deserializer: &mut Deserializer) -> Result<Self, Error> {
match deserializer.consume_next_type() { match deserializer.consume_next_type() {
@ -203,7 +203,7 @@ impl<'a> Visitor<'a> for StrVisitor {
} }
impl<'xml> FromXml<'xml> for &'xml str { 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<Self, Error> { fn deserialize(deserializer: &mut Deserializer<'xml>) -> Result<Self, Error> {
match deserializer.consume_next_type() { match deserializer.consume_next_type() {
@ -224,7 +224,7 @@ impl<'a> Visitor<'a> for CowStrVisitor {
} }
impl<'xml> FromXml<'xml> for Cow<'xml, str> { 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<Self, Error> { fn deserialize(deserializer: &mut Deserializer<'xml>) -> Result<Self, Error> {
match deserializer.consume_next_type() { match deserializer.consume_next_type() {
@ -238,7 +238,7 @@ impl<'xml, T> FromXml<'xml> for Option<T>
where where
T: FromXml<'xml>, T: FromXml<'xml>,
{ {
const TAG_NAME: TagName<'xml> = <T>::TAG_NAME; const TAG_NAME: TagName = <T>::TAG_NAME;
fn deserialize(deserializer: &mut Deserializer<'xml>) -> Result<Self, Error> { fn deserialize(deserializer: &mut Deserializer<'xml>) -> Result<Self, Error> {
match <T>::deserialize(deserializer) { match <T>::deserialize(deserializer) {

6
instant-xml/src/lib.rs
View File

@ -179,13 +179,13 @@ pub enum EntityType {
Attribute, Attribute,
} }
pub enum TagName<'xml> { pub enum TagName {
FieldName, FieldName,
Custom(&'xml str), Custom(&'static str),
} }
pub trait FromXml<'xml>: Sized { pub trait FromXml<'xml>: Sized {
const TAG_NAME: TagName<'xml>; const TAG_NAME: TagName;
fn from_xml(input: &'xml str) -> Result<Self, Error> { fn from_xml(input: &'xml str) -> Result<Self, Error> {
let mut deserializer = Deserializer::new(input); let mut deserializer = Deserializer::new(input);