Skip to content

Avoid naming conflicts #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ImJeremyHe merged 1 commit into from
Oct 23, 2025
Merged

Avoid naming conflicts #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 30 additions & 28 deletions derives/src/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub fn get_de_enum_impl_block(container: Container) -> proc_macro2::TokenStream
if let Some(ty) = ty {
quote! {
#name => {
let _r = #ty::deserialize(#name, reader, $attrs, $b);
let _r = #ty::deserialize(#name, _reader_, $attrs, $b);
return Self::#ident(_r);
}
}
Expand Down Expand Up @@ -76,26 +76,26 @@ pub fn get_de_enum_impl_block(container: Container) -> proc_macro2::TokenStream
let name = v.name.as_ref().expect("should have `name` for `child`");
quote! {#name}
});
let exact_tags = children_branches!(attrs, is_empty);
let exact_tags = children_branches!(_attrs_, _is_empty_);
quote! {
#[allow(unused_assignments)]
impl #impl_generics ::xmlserde::XmlDeserialize for #ident #type_generics #where_clause {
fn deserialize<B: std::io::BufRead>(
tag: &[u8],
reader: &mut ::xmlserde::quick_xml::Reader<B>,
attrs: ::xmlserde::quick_xml::events::attributes::Attributes,
is_empty: bool,
_tag_: &[u8],
_reader_: &mut ::xmlserde::quick_xml::Reader<B>,
_attrs_: ::xmlserde::quick_xml::events::attributes::Attributes,
_is_empty_: bool,
) -> Self {
use ::xmlserde::quick_xml::events::*;
match tag {
match _tag_ {
#(#exact_tags)*
_ => {},
}
let mut buf = Vec::<u8>::new();
let mut result = Option::<Self>::None;
loop {
match reader.read_event_into(&mut buf) {
Ok(Event::End(e)) if e.name().into_inner() == tag => {
match _reader_.read_event_into(&mut buf) {
Ok(Event::End(e)) if e.name().into_inner() == _tag_ => {
break
},
Ok(Event::Start(_s)) => match _s.name().into_inner() {
Expand Down Expand Up @@ -217,13 +217,13 @@ pub fn get_de_struct_impl_block(container: Container) -> proc_macro2::TokenStrea
#[allow(unused_assignments)]
impl #impl_generics ::xmlserde::XmlDeserialize for #ident #type_generics #where_clause {
fn deserialize<B: std::io::BufRead>(
tag: &[u8],
reader: &mut ::xmlserde::quick_xml::Reader<B>,
attrs: ::xmlserde::quick_xml::events::attributes::Attributes,
is_empty: bool,
_tag_: &[u8],
_reader_: &mut ::xmlserde::quick_xml::Reader<B>,
_attrs_: ::xmlserde::quick_xml::events::attributes::Attributes,
_is_empty_: bool,
) -> Self {
#fields_init
attrs.into_iter().for_each(|attr| {
_attrs_.into_iter().for_each(|attr| {
if let Ok(attr) = attr {
match attr.key.into_inner() {
#(#attr_branches)*
Expand All @@ -237,17 +237,19 @@ pub fn get_de_struct_impl_block(container: Container) -> proc_macro2::TokenStrea
let mut buf = Vec::<u8>::new();
use ::xmlserde::quick_xml::events::Event;
#vec_init
if is_empty {} else {
if _is_empty_ {} else {
loop {
match reader.read_event_into(&mut buf) {
Ok(Event::End(e)) if e.name().into_inner() == tag => {
match _reader_.read_event_into(&mut buf) {
Ok(Event::End(e)) if e.name().into_inner() == _tag_ => {
break
},
#sfc_branch
#child_branches
#text_branch
#encounter_unknown_branch
Ok(Event::Eof) => break,
Ok(Event::Eof) => {
break;
},
Err(_) => break,
_ => {},
}
Expand Down Expand Up @@ -693,17 +695,17 @@ fn untag_enums_match_branch(fields: &[StructField]) -> proc_macro2::TokenStream
let branch = match f.generic {
Generic::Vec(ty) => quote! {
_ty if #ty::__get_children_tags().contains(&_ty) => {
#ident.push(#ty::deserialize(_ty, reader, s.attributes(), is_empty));
#ident.push(#ty::deserialize(_ty, _reader_, s.attributes(), _is_empty_));
}
},
Generic::Opt(ty) => quote! {
_ty if #ty::__get_children_tags().contains(&_ty) => {
#ident = Some(#ty::deserialize(_ty, reader, s.attributes(), is_empty));
#ident = Some(#ty::deserialize(_ty, _reader_, s.attributes(), _is_empty_));
}
},
Generic::None => quote! {
_t if #ty::__get_children_tags().contains(&_t) => {
#ident = Some(#ty::deserialize(_t, reader, s.attributes(), is_empty));
#ident = Some(#ty::deserialize(_t, _reader_, s.attributes(), _is_empty_));
}
},
};
Expand All @@ -730,15 +732,15 @@ fn untag_structs_match_branch(fields: &[StructField]) -> proc_macro2::TokenStrea
Generic::Vec(_) => unreachable!(),
Generic::Opt(t) => quote! {
_t if #t::__get_children_tags().contains(&_t) => {
let _r = ::xmlserde::Unparsed::deserialize(_t, reader, s.attributes(), is_empty);
let _r = ::xmlserde::Unparsed::deserialize(_t, _reader_, s.attributes(), _is_empty_);
let _tags = #t::__get_children_tags();
let idx = _tags.binary_search(&_t).unwrap();
#ident_opt_unparsed_array.push((_tags[idx], _r));
}
},
Generic::None => quote! {
_t if #ty::__get_children_tags().contains(&_t) => {
let _r = ::xmlserde::Unparsed::deserialize(_t, reader, s.attributes(), is_empty);
let _r = ::xmlserde::Unparsed::deserialize(_t, _reader_, s.attributes(), _is_empty_);
let _tags = #ty::__get_children_tags();
let idx = _tags.binary_search(&_t).unwrap();
#ident_unparsed_array.push((_tags[idx], _r));
Expand Down Expand Up @@ -772,15 +774,15 @@ fn children_match_branch(
Generic::Vec(vec_ty) => {
quote! {
#tag => {
let __ele = #vec_ty::deserialize(#tag, reader, s.attributes(), is_empty);
let __ele = #vec_ty::deserialize(#tag, _reader_, s.attributes(), _is_empty_);
#ident.push(__ele);
}
}
}
Generic::Opt(opt_ty) => {
quote! {
#tag => {
let __f = #opt_ty::deserialize(#tag, reader, s.attributes(), is_empty);
let __f = #opt_ty::deserialize(#tag, _reader_, s.attributes(), _is_empty_);
#ident = Some(__f);
},
}
Expand All @@ -797,7 +799,7 @@ fn children_match_branch(
};
quote! {
#tag => {
let __f = #t::deserialize(#tag, reader, s.attributes(), is_empty);
let __f = #t::deserialize(#tag, _reader_, s.attributes(), _is_empty_);
#tt
},
}
Expand All @@ -811,7 +813,7 @@ fn children_match_branch(

quote! {
Ok(Event::Empty(s)) => {
let is_empty = true;
let _is_empty_ = true;
match s.name().into_inner() {
#(#branches)*
#untagged_enums_branches
Expand All @@ -820,7 +822,7 @@ fn children_match_branch(
}
}
Ok(Event::Start(s)) => {
let is_empty = false;
let _is_empty_ = false;
match s.name().into_inner() {
#(#branches)*
#untagged_enums_branches
Expand Down
68 changes: 34 additions & 34 deletions derives/src/ser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,34 @@ fn get_ser_enum_impl_block(container: Container) -> proc_macro2::TokenStream {
let name = v.name.as_ref().expect("should have name");
quote!{
Self::#f => {
if tag == b"" {
if _tag_ == b"" {
let _t = String::from_utf8_lossy(#name);
let _ = writer.write_event(Event::Empty(BytesStart::new(_t)));
let _ = _writer_.write_event(Event::Empty(BytesStart::new(_t)));
} else {
let _ = writer.write_event(Event::Start(BytesStart::new(String::from_utf8_lossy(tag))));
let _ = _writer_.write_event(Event::Start(BytesStart::new(String::from_utf8_lossy(_tag_))));
let _t = String::from_utf8_lossy(#name);
let _ = writer.write_event(Event::Empty(BytesStart::new(_t)));
let _ = writer.write_event(Event::End(BytesEnd::new(String::from_utf8_lossy(tag))));
let _ = _writer_.write_event(Event::Empty(BytesStart::new(_t)));
let _ = _writer_.write_event(Event::End(BytesEnd::new(String::from_utf8_lossy(_tag_))));
}
}
}
} else {
if matches!(ele_ty, EleType::Text) {
quote!{
Self::#f(c) => {
let _ = writer.write_event(Event::Text(BytesText::new(&c.serialize())));
let _ = _writer_.write_event(Event::Text(BytesText::new(&c.serialize())));
}
}
} else {
let name = v.name.as_ref().expect("should have hame");
quote! {
Self::#f(c) => {
if tag == b"" {
c.serialize(#name, writer);
if _tag_ == b"" {
c.serialize(#name, _writer_);
} else {
let _ = writer.write_event(Event::Start(BytesStart::new(String::from_utf8_lossy(tag))));
c.serialize(#name, writer);
let _ = writer.write_event(Event::End(BytesEnd::new(String::from_utf8_lossy(tag))));
let _ = _writer_.write_event(Event::Start(BytesStart::new(String::from_utf8_lossy(_tag_))));
c.serialize(#name, _writer_);
let _ = _writer_.write_event(Event::End(BytesEnd::new(String::from_utf8_lossy(_tag_))));
}
},
}
Expand All @@ -61,8 +61,8 @@ fn get_ser_enum_impl_block(container: Container) -> proc_macro2::TokenStream {
impl #impl_generics ::xmlserde::XmlSerialize for #ident #type_generics #where_clause {
fn serialize<W: std::io::Write>(
&self,
tag: &[u8],
writer: &mut ::xmlserde::quick_xml::Writer<W>,
_tag_: &[u8],
_writer_: &mut ::xmlserde::quick_xml::Writer<W>,
) {
use ::xmlserde::quick_xml::events::*;
match self {
Expand All @@ -76,7 +76,7 @@ fn get_ser_enum_impl_block(container: Container) -> proc_macro2::TokenStream {
fn get_ser_struct_impl_block(container: Container) -> proc_macro2::TokenStream {
let write_ns = match container.with_ns {
Some(ns) => quote! {
attrs.push(Attribute::from((b"xmlns".as_ref(), #ns.as_ref())));
_attrs_.push(Attribute::from((b"xmlns".as_ref(), #ns.as_ref())));
},
None => quote! {},
};
Expand All @@ -87,7 +87,7 @@ fn get_ser_struct_impl_block(container: Container) -> proc_macro2::TokenStream {
quote! {
let mut __vec = b"xmlns:".to_vec();
__vec.extend(#ns.to_vec());
attrs.push(Attribute::from((__vec.as_ref(), #value.as_ref())));
_attrs_.push(Attribute::from((__vec.as_ref(), #value.as_ref())));
}
});
quote! {#(#cns)*}
Expand Down Expand Up @@ -116,7 +116,7 @@ fn get_ser_struct_impl_block(container: Container) -> proc_macro2::TokenStream {
match &self.#ident {
Some(v) => {
sr = v.serialize();
attrs.push(Attribute::from((#name.as_ref(), sr.as_bytes())));
_attrs_.push(Attribute::from((#name.as_ref(), sr.as_bytes())));
},
None => {},
}
Expand All @@ -127,12 +127,12 @@ fn get_ser_struct_impl_block(container: Container) -> proc_macro2::TokenStream {
let mut ser;
if #path() != self.#ident {
ser = self.#ident.serialize();
attrs.push(Attribute::from((#name.as_ref(), ser.as_bytes())));
_attrs_.push(Attribute::from((#name.as_ref(), ser.as_bytes())));
}
},
None => quote! {
let ser = self.#ident.serialize();
attrs.push(Attribute::from((#name.as_ref(), ser.as_bytes())));
_attrs_.push(Attribute::from((#name.as_ref(), ser.as_bytes())));
},
},
}
Expand All @@ -146,15 +146,15 @@ fn get_ser_struct_impl_block(container: Container) -> proc_macro2::TokenStream {
Some(__d) => {
let r = __d.serialize();
let event = BytesText::new(&r);
writer.write_event(Event::Text(event));
_writer_.write_event(Event::Text(event));
}
}
}
} else {
quote! {
let r = self.#ident.serialize();
let event = BytesText::new(&r);
writer.write_event(Event::Text(event));
_writer_.write_event(Event::Text(event));
}
}
} else {
Expand All @@ -164,7 +164,7 @@ fn get_ser_struct_impl_block(container: Container) -> proc_macro2::TokenStream {
quote! {
if self.#ident {
let event = BytesStart::new(String::from_utf8_lossy(#name));
writer.write_event(Event::Empty(event));
_writer_.write_event(Event::Empty(event));
}
}
});
Expand All @@ -175,14 +175,14 @@ fn get_ser_struct_impl_block(container: Container) -> proc_macro2::TokenStream {
let ident = f.original.ident.as_ref().unwrap();
let name = f.name.as_ref().expect("should have name");
quote! {
self.#ident.serialize(#name, writer);
self.#ident.serialize(#name, _writer_);
}
}
});
let write_untags = untags.into_iter().map(|f| {
let ident = f.original.ident.as_ref().expect("should have name");
quote! {
self.#ident.serialize(b"", writer);
self.#ident.serialize(b"", _writer_);
}
});
quote! {
Expand All @@ -195,15 +195,15 @@ fn get_ser_struct_impl_block(container: Container) -> proc_macro2::TokenStream {
let (impl_generics, type_generics, where_clause) = container.original.generics.split_for_impl();
let write_event = quote! {
if is_empty {
writer.write_event(Event::Empty(start));
} else if is_untagged {
_writer_.write_event(Event::Empty(start));
} else if _is_untagged_ {
// Not to write the start event
#write_text_or_children
} else {
writer.write_event(Event::Start(start));
_writer_.write_event(Event::Start(start));
#write_text_or_children
let end = BytesEnd::new(String::from_utf8_lossy(tag));
writer.write_event(Event::End(end));
let end = BytesEnd::new(String::from_utf8_lossy(_tag_));
_writer_.write_event(Event::End(end));
}
};
let get_root = if let Some(r) = &container.root {
Expand All @@ -220,19 +220,19 @@ fn get_ser_struct_impl_block(container: Container) -> proc_macro2::TokenStream {
impl #impl_generics ::xmlserde::XmlSerialize for #ident #type_generics #where_clause {
fn serialize<W: std::io::Write>(
&self,
tag: &[u8],
writer: &mut ::xmlserde::quick_xml::Writer<W>,
_tag_: &[u8],
_writer_: &mut ::xmlserde::quick_xml::Writer<W>,
) {
use ::xmlserde::quick_xml::events::*;
use ::xmlserde::quick_xml::events::attributes::Attribute;
use ::xmlserde::XmlValue;
let start = BytesStart::new(String::from_utf8_lossy(tag));
let mut attrs = Vec::<Attribute>::new();
let is_untagged = tag.len() == 0;
let start = BytesStart::new(String::from_utf8_lossy(_tag_));
let mut _attrs_ = Vec::<Attribute>::new();
let _is_untagged_ = _tag_.len() == 0;
#write_ns
#write_custom_ns
#(#build_attr_and_push)*
let start = start.with_attributes(attrs);
let start = start.with_attributes(_attrs_);
#init
#write_event
}
Expand Down
Loading