From 6721e876fa8442599dce8833f55c03b63c9fda0b Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:36:46 +0100 Subject: [PATCH] xml: Rename XmlRoot to XmlRootTag --- crates/xml/derive/src/de/de_struct.rs | 4 ++-- crates/xml/derive/src/lib.rs | 6 +++--- crates/xml/src/de.rs | 6 +++--- crates/xml/src/lib.rs | 2 +- crates/xml/tests/de_enum.rs | 6 +++--- crates/xml/tests/de_struct.rs | 22 +++++++++++----------- crates/xml/tests/se_struct.rs | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/crates/xml/derive/src/de/de_struct.rs b/crates/xml/derive/src/de/de_struct.rs index ce7a112..856bc1c 100644 --- a/crates/xml/derive/src/de/de_struct.rs +++ b/crates/xml/derive/src/de/de_struct.rs @@ -47,7 +47,7 @@ pub struct NamedStruct { } impl NamedStruct { - pub fn impl_xml_root(&self) -> proc_macro2::TokenStream { + pub fn impl_xml_root_tag(&self) -> proc_macro2::TokenStream { let (impl_generics, type_generics, where_clause) = self.generics.split_for_impl(); let ident = &self.ident; let root = self.attrs.root.as_ref().expect("No root attribute found"); @@ -56,7 +56,7 @@ impl NamedStruct { None => quote! { None }, }; quote! { - impl #impl_generics ::rustical_xml::XmlRoot for #ident #type_generics #where_clause { + impl #impl_generics ::rustical_xml::XmlRootTag for #ident #type_generics #where_clause { fn root_tag() -> &'static [u8] { #root } fn root_ns() -> Option<&'static [u8]> { #ns } } diff --git a/crates/xml/derive/src/lib.rs b/crates/xml/derive/src/lib.rs index 7f533dd..862cabf 100644 --- a/crates/xml/derive/src/lib.rs +++ b/crates/xml/derive/src/lib.rs @@ -28,12 +28,12 @@ pub fn derive_xml_serialize(input: proc_macro::TokenStream) -> proc_macro::Token .into() } -#[proc_macro_derive(XmlRoot, attributes(xml))] -pub fn derive_xml_root(input: proc_macro::TokenStream) -> proc_macro::TokenStream { +#[proc_macro_derive(XmlRootTag, attributes(xml))] +pub fn derive_xml_root_tag(input: proc_macro::TokenStream) -> proc_macro::TokenStream { let input = parse_macro_input!(input as DeriveInput); match &input.data { - syn::Data::Struct(s) => NamedStruct::parse(&input, s).impl_xml_root(), + syn::Data::Struct(s) => NamedStruct::parse(&input, s).impl_xml_root_tag(), syn::Data::Enum(_) => panic!("Enum not supported as root"), syn::Data::Union(_) => panic!("Union not supported as root"), } diff --git a/crates/xml/src/de.rs b/crates/xml/src/de.rs index 586a1aa..546ee76 100644 --- a/crates/xml/src/de.rs +++ b/crates/xml/src/de.rs @@ -2,7 +2,7 @@ use quick_xml::name::Namespace; use quick_xml::name::ResolveResult; use std::io::BufRead; pub use xml_derive::XmlDeserialize; -pub use xml_derive::XmlRoot; +pub use xml_derive::XmlRootTag; use quick_xml::events::{BytesStart, Event}; use thiserror::Error; @@ -43,7 +43,7 @@ pub trait XmlDeserialize: Sized { ) -> Result; } -pub trait XmlRoot { +pub trait XmlRootTag { fn root_tag() -> &'static [u8]; fn root_ns() -> Option<&'static [u8]>; } @@ -67,7 +67,7 @@ pub trait XmlDocument: XmlDeserialize { } } -impl XmlDocument for T { +impl XmlDocument for T { fn parse(mut reader: quick_xml::NsReader) -> Result where Self: XmlDeserialize, diff --git a/crates/xml/src/lib.rs b/crates/xml/src/lib.rs index afcc83b..2b8896d 100644 --- a/crates/xml/src/lib.rs +++ b/crates/xml/src/lib.rs @@ -7,7 +7,7 @@ mod value; pub use de::XmlDeError; pub use de::XmlDeserialize; -pub use de::XmlRoot; +pub use de::XmlRootTag; pub use se::XmlSerialize; pub use value::Value; diff --git a/crates/xml/tests/de_enum.rs b/crates/xml/tests/de_enum.rs index ab62b43..bcc93b4 100644 --- a/crates/xml/tests/de_enum.rs +++ b/crates/xml/tests/de_enum.rs @@ -1,8 +1,8 @@ -use rustical_xml::{de::XmlDocument, Unit, XmlDeserialize, XmlRoot}; +use rustical_xml::{de::XmlDocument, Unit, XmlDeserialize, XmlRootTag}; #[test] fn test_struct_tagged_enum() { - #[derive(Debug, XmlDeserialize, XmlRoot, PartialEq)] + #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)] #[xml(root = b"propfind")] struct Propfind { prop: Prop, @@ -57,7 +57,7 @@ fn test_struct_tagged_enum() { #[test] fn test_tagged_enum_complex() { - #[derive(Debug, XmlDeserialize, XmlRoot, PartialEq)] + #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)] #[xml(root = b"propfind")] struct Propfind { prop: PropStruct, diff --git a/crates/xml/tests/de_struct.rs b/crates/xml/tests/de_struct.rs index 881c88d..a6aa9bd 100644 --- a/crates/xml/tests/de_struct.rs +++ b/crates/xml/tests/de_struct.rs @@ -1,11 +1,11 @@ use rustical_xml::de::XmlDocument; -use rustical_xml::XmlRoot; +use rustical_xml::XmlRootTag; use rustical_xml::{Unit, Unparsed, XmlDeserialize}; use std::collections::HashSet; #[test] fn test_struct_text_field() { - #[derive(Debug, XmlDeserialize, XmlRoot, PartialEq)] + #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)] #[xml(root = b"document")] struct Document { #[xml(ty = "text")] @@ -26,7 +26,7 @@ fn test_struct_text_field() { #[test] fn test_struct_document() { - #[derive(Debug, XmlDeserialize, XmlRoot, PartialEq)] + #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)] #[xml(root = b"document")] struct Document { child: Child, @@ -51,7 +51,7 @@ fn test_struct_document() { #[test] fn test_struct_rename_field() { - #[derive(Debug, XmlDeserialize, XmlRoot, PartialEq)] + #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)] #[xml(root = b"document")] struct Document { #[xml(rename = b"ok-wow")] @@ -77,7 +77,7 @@ fn test_struct_rename_field() { #[test] fn test_struct_optional_field() { - #[derive(Debug, XmlDeserialize, XmlRoot, PartialEq)] + #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)] #[xml(root = b"document")] struct Document { #[xml(default = "Default::default")] @@ -96,7 +96,7 @@ fn test_struct_optional_field() { #[test] fn test_struct_vec() { - #[derive(Debug, XmlDeserialize, XmlRoot, PartialEq)] + #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)] #[xml(root = b"document")] struct Document { #[xml(rename = b"child", flatten)] @@ -124,7 +124,7 @@ fn test_struct_vec() { #[test] fn test_struct_set() { - #[derive(Debug, XmlDeserialize, XmlRoot, PartialEq)] + #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)] #[xml(root = b"document")] struct Document { #[xml(rename = b"child", flatten)] @@ -152,7 +152,7 @@ fn test_struct_set() { #[test] fn test_struct_ns() { - #[derive(Debug, XmlDeserialize, XmlRoot, PartialEq)] + #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)] #[xml(root = b"document", ns_strict)] struct Document { #[xml(ns = b"hello")] @@ -165,7 +165,7 @@ fn test_struct_ns() { #[test] fn test_struct_attr() { - #[derive(Debug, XmlDeserialize, XmlRoot, PartialEq)] + #[derive(Debug, XmlDeserialize, XmlRootTag, PartialEq)] #[xml(root = b"document", ns_strict)] struct Document { #[xml(ns = b"hello")] @@ -192,7 +192,7 @@ fn test_struct_attr() { #[test] fn test_struct_generics() { - #[derive(XmlDeserialize, XmlRoot)] + #[derive(XmlDeserialize, XmlRootTag)] #[xml(root = b"document", ns_strict)] struct Document { child: T, @@ -212,7 +212,7 @@ fn test_struct_generics() { #[test] fn test_struct_unparsed() { - #[derive(XmlDeserialize, XmlRoot)] + #[derive(XmlDeserialize, XmlRootTag)] #[xml(root = b"document", ns_strict)] struct Document { child: Unparsed, diff --git a/crates/xml/tests/se_struct.rs b/crates/xml/tests/se_struct.rs index bf211ee..3b33c1c 100644 --- a/crates/xml/tests/se_struct.rs +++ b/crates/xml/tests/se_struct.rs @@ -1,9 +1,9 @@ -use rustical_xml::{XmlRoot, XmlSerialize}; +use rustical_xml::{XmlRootTag, XmlSerialize}; use xml_derive::XmlDeserialize; #[test] fn test_struct_document() { - #[derive(Debug, XmlRoot, XmlSerialize, XmlDeserialize, PartialEq)] + #[derive(Debug, XmlRootTag, XmlSerialize, XmlDeserialize, PartialEq)] #[xml(root = b"document")] struct Document { child: Child,