nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 22:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

xml: EnumVariant variant_names for untagged enums

Browse Source
This commit is contained in:
Lennart
2025-01-18 18:38:24 +01:00
parent e31cd03179
commit 6b00e4294b
4 changed files with 68 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
crates/xml/derive/src/xml_enum.rs
View File

@@ -198,21 +198,43 @@ impl Enum {
let (impl_generics, type_generics, where_clause) = self.generics.split_for_impl();
let ident = &self.ident;
let tagged_variants = self.variants.iter().map(|variant| {
let ns = match &variant.attrs.common.ns {
Some(ns) => quote! { Some(#ns) },
None => quote! { None },
};
let b_xml_name = variant.xml_name().value();
let xml_name = String::from_utf8_lossy(&b_xml_name);
quote! {(#ns, #xml_name)}
});
if self.attrs.untagged.is_present() {
let untagged_variants = self.variants.iter().map(|variant| {
let ty = &variant.deserializer_type();
quote! { #ty::variant_names() }
});
quote! {
impl #impl_generics ::rustical_xml::EnumVariants for #ident #type_generics #where_clause {
const TAGGED_VARIANTS: &'static [(Option<::quick_xml::name::Namespace<'static>>, &'static str)] = &[];
quote! {
impl #impl_generics ::rustical_xml::EnumVariants for #ident #type_generics #where_clause {
const TAGGED_VARIANTS: &'static [(Option<::quick_xml::name::Namespace<'static>>, &'static str)] = &[
#(#tagged_variants),*
];
fn variant_names() -> Vec<(Option<Namespace<'static>>, &'static str)> {
[
#(#untagged_variants),*
].concat()
}
}
}
} else {
let tagged_variants = self.variants.iter().map(|variant| {
let ns = match &variant.attrs.common.ns {
Some(ns) => quote! { Some(#ns) },
None => quote! { None },
};
let b_xml_name = variant.xml_name().value();
let xml_name = String::from_utf8_lossy(&b_xml_name);
quote! {(#ns, #xml_name)}
});
quote! {
impl #impl_generics ::rustical_xml::EnumVariants for #ident #type_generics #where_clause {
const TAGGED_VARIANTS: &'static [(Option<::quick_xml::name::Namespace<'static>>, &'static str)] = &[
#(#tagged_variants),*
];
fn variant_names() -> Vec<(Option<Namespace<'static>>, &'static str)> {
[Self::TAGGED_VARIANTS,].concat()
}
}
}
}
}

2
crates/xml/derive/src/xml_struct.rs
View File

@@ -259,7 +259,7 @@ impl NamedStruct {
.map(|field| {
let field_index = field.target_field_index();
quote! {
let ns = Some(self.#field_index);
let ns = self.#field_index;
}
});

3
crates/xml/src/lib.rs
View File

@@ -25,4 +25,7 @@ pub trait XmlRootTag {
pub trait EnumVariants {
const TAGGED_VARIANTS: &'static [(Option<Namespace<'static>>, &'static str)];
// Returns all valid xml names including untagged variants
fn variant_names() -> Vec<(Option<Namespace<'static>>, &'static str)>;
}

30
crates/xml/tests/enum_variants.rs
View File

@@ -10,7 +10,12 @@ pub const NS_CALENDARSERVER: Namespace = Namespace(b"http://calendarserver.org/n
pub const NS_NEXTCLOUD: Namespace = Namespace(b"http://nextcloud.com/ns");
#[derive(EnumVariants)]
pub enum CalendarProp {
enum ExtensionProp {
Hello,
}
#[derive(EnumVariants)]
enum CalendarProp {
// WebDAV (RFC 2518)
#[xml(ns = "NS_DAV")]
Displayname(Option<String>),
@@ -23,7 +28,7 @@ pub enum CalendarProp {
}
#[test]
fn test_enum_variants() {
fn test_enum_tagged_variants() {
assert_eq!(
CalendarProp::TAGGED_VARIANTS,
&[
@@ -34,3 +39,24 @@ fn test_enum_variants() {
]
);
}
#[derive(EnumVariants)]
#[xml(untagged)]
enum UnionProp {
Calendar(CalendarProp),
Extension(ExtensionProp),
}
#[test]
fn test_enum_untagged_variants() {
assert_eq!(
UnionProp::variant_names(),
vec![
(Some(NS_DAV), "displayname"),
(Some(NS_DAV), "getcontenttype"),
(Some(NS_DAV), "principal-URL"),
(None, "topic"),
(None, "hello"),
]
);
}