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 split_for_impl() to improve generics handling

This commit is contained in:
Dirkjan Ochtman 2022-09-05 13:28:52 +02:00
parent afdbf2dc45
commit 000b47628b
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
use proc_macro2::{Ident, Span, TokenStream}; use proc_macro2::{Ident, Span, TokenStream};
use quote::{quote, ToTokens}; use quote::quote;
use crate::{ContainerMeta, FieldMeta, Namespace}; use crate::{ContainerMeta, FieldMeta, Namespace};
@ -41,30 +41,16 @@ impl Deserializer {
Namespace::Literal(ns) => ns, Namespace::Literal(ns) => ns,
}; };
let generics = (&input.generics).into_token_stream(); let mut xml_generics = input.generics.clone();
let lifetimes = (&input.generics.params).into_token_stream(); let mut xml = syn::LifetimeDef::new(syn::Lifetime::new("'xml", Span::call_site()));
xml.bounds
.extend(xml_generics.lifetimes().map(|lt| lt.lifetime.clone()));
xml_generics.params.push(xml.into());
let mut lifetime_xml = TokenStream::new(); let (_, ty_generics, where_clause) = input.generics.split_for_impl();
let mut lifetime_visitor = TokenStream::new(); let (xml_impl_generics, xml_ty_generics, xml_where_clause) = xml_generics.split_for_impl();
let iter = &mut input.generics.params.iter();
if let Some(it) = iter.next() {
lifetime_xml = quote!(:);
lifetime_xml.extend(it.into_token_stream());
while let Some(it) = iter.by_ref().next() {
lifetime_xml.extend(quote!(+));
lifetime_xml.extend(it.into_token_stream());
}
lifetime_xml.extend(quote!(,));
lifetime_xml.extend(lifetimes.clone());
lifetime_visitor.extend(quote!(,));
lifetime_visitor.extend(lifetimes);
}
let name = ident.to_string();
let mut out = TokenStream::new();
let mut namespaces_map = quote!(let mut namespaces_map = std::collections::HashMap::new();); let mut namespaces_map = quote!(let mut namespaces_map = std::collections::HashMap::new(););
for (k, v) in container_meta.ns.prefixes.iter() { for (k, v) in container_meta.ns.prefixes.iter() {
namespaces_map.extend(quote!( namespaces_map.extend(quote!(
namespaces_map.insert(#k, #v); namespaces_map.insert(#k, #v);
@ -126,6 +112,8 @@ impl Deserializer {
let attributes_names = attributes_tokens.names; let attributes_names = attributes_tokens.names;
let attr_type_match = attributes_tokens.match_; let attr_type_match = attributes_tokens.match_;
let name = ident.to_string();
let mut out = TokenStream::new();
out.extend(quote!( out.extend(quote!(
fn deserialize(deserializer: &mut ::instant_xml::Deserializer<'xml>) -> Result<Self, ::instant_xml::Error> { fn deserialize(deserializer: &mut ::instant_xml::Deserializer<'xml>) -> Result<Self, ::instant_xml::Error> {
use ::instant_xml::de::{XmlRecord, Deserializer, Visitor}; use ::instant_xml::de::{XmlRecord, Deserializer, Visitor};
@ -141,13 +129,13 @@ impl Deserializer {
__Ignore, __Ignore,
} }
struct StructVisitor<'xml #lifetime_xml> { struct StructVisitor #xml_ty_generics {
marker: std::marker::PhantomData<#ident #generics>, marker: std::marker::PhantomData<#ident #ty_generics>,
lifetime: std::marker::PhantomData<&'xml ()>, lifetime: std::marker::PhantomData<&'xml ()>,
} }
impl<'xml #lifetime_xml> Visitor<'xml> for StructVisitor<'xml #lifetime_visitor> { impl #xml_impl_generics Visitor<'xml> for StructVisitor #xml_ty_generics #xml_where_clause {
type Value = #ident #generics; type Value = #ident #ty_generics;
fn visit_struct( fn visit_struct(
&self, &self,
@ -226,7 +214,7 @@ impl Deserializer {
)); ));
out = quote!( out = quote!(
impl<'xml #lifetime_xml> FromXml<'xml> for #ident #generics { impl #xml_impl_generics FromXml<'xml> for #ident #ty_generics #where_clause {
#out #out
} }
); );

6
instant-xml-macros/src/ser.rs
View File

@ -1,11 +1,11 @@
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use quote::{quote, ToTokens}; use quote::quote;
use crate::{ContainerMeta, FieldMeta, Namespace}; use crate::{ContainerMeta, FieldMeta, Namespace};
pub fn to_xml(input: &syn::DeriveInput) -> proc_macro2::TokenStream { pub fn to_xml(input: &syn::DeriveInput) -> proc_macro2::TokenStream {
let ident = &input.ident; let ident = &input.ident;
let generics = (&input.generics).into_token_stream(); let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
let root_name = ident.to_string(); let root_name = ident.to_string();
let mut serializer = Serializer::new(input); let mut serializer = Serializer::new(input);
@ -36,7 +36,7 @@ pub fn to_xml(input: &syn::DeriveInput) -> proc_macro2::TokenStream {
let current_namespaces = serializer.namespaces_token(); let current_namespaces = serializer.namespaces_token();
quote!( quote!(
impl #generics ToXml for #ident #generics { impl #impl_generics ToXml for #ident #ty_generics #where_clause {
fn serialize<W: ::core::fmt::Write + ?::core::marker::Sized>( fn serialize<W: ::core::fmt::Write + ?::core::marker::Sized>(
&self, &self,
serializer: &mut instant_xml::Serializer<W>, serializer: &mut instant_xml::Serializer<W>,