diff --git a/crates/dav/src/xml/error.rs b/crates/dav/src/xml/error.rs index 2f24858..8dc5afc 100644 --- a/crates/dav/src/xml/error.rs +++ b/crates/dav/src/xml/error.rs @@ -3,10 +3,10 @@ use rustical_xml::{XmlRootTag, XmlSerialize}; #[derive(XmlSerialize, XmlRootTag)] #[xml(ns = "crate::namespace::NS_DAV", root = b"error")] #[xml(ns_prefix( - crate::namespace::NS_DAV = b"", - crate::namespace::NS_CARDDAV = b"CARD", - crate::namespace::NS_CALDAV = b"CAL", - crate::namespace::NS_CALENDARSERVER = b"CS", - crate::namespace::NS_DAVPUSH = b"PUSH" + crate::namespace::NS_DAV = "", + crate::namespace::NS_CARDDAV = "CARD", + crate::namespace::NS_CALDAV = "CAL", + crate::namespace::NS_CALENDARSERVER = "CS", + crate::namespace::NS_DAVPUSH = "PUSH" ))] pub struct ErrorElement<'t, T: XmlSerialize>(#[xml(ty = "untagged")] pub &'t T); diff --git a/crates/dav/src/xml/multistatus.rs b/crates/dav/src/xml/multistatus.rs index 7349f2c..19c9f73 100644 --- a/crates/dav/src/xml/multistatus.rs +++ b/crates/dav/src/xml/multistatus.rs @@ -42,11 +42,11 @@ pub enum PropstatWrapper { #[derive(XmlSerialize, XmlRootTag)] #[xml(ns = "crate::namespace::NS_DAV", root = b"response")] #[xml(ns_prefix( - crate::namespace::NS_DAV = b"", - crate::namespace::NS_CARDDAV = b"CARD", - crate::namespace::NS_CALDAV = b"CAL", - crate::namespace::NS_CALENDARSERVER = b"CS", - crate::namespace::NS_DAVPUSH = b"PUSH" + crate::namespace::NS_DAV = "", + crate::namespace::NS_CARDDAV = "CARD", + crate::namespace::NS_CALDAV = "CAL", + crate::namespace::NS_CALENDARSERVER = "CS", + crate::namespace::NS_DAVPUSH = "PUSH" ))] pub struct ResponseElement { pub href: String, @@ -88,11 +88,11 @@ impl Default for ResponseElement { #[derive(XmlSerialize, XmlRootTag)] #[xml(root = b"multistatus", ns = "crate::namespace::NS_DAV")] #[xml(ns_prefix( - crate::namespace::NS_DAV = b"", - crate::namespace::NS_CARDDAV = b"CARD", - crate::namespace::NS_CALDAV = b"CAL", - crate::namespace::NS_CALENDARSERVER = b"CS", - crate::namespace::NS_DAVPUSH = b"PUSH" + crate::namespace::NS_DAV = "", + crate::namespace::NS_CARDDAV = "CARD", + crate::namespace::NS_CALDAV = "CAL", + crate::namespace::NS_CALENDARSERVER = "CS", + crate::namespace::NS_DAVPUSH = "PUSH" ))] pub struct MultistatusElement { #[xml(rename = b"response", flatten)] diff --git a/crates/dav_push/src/lib.rs b/crates/dav_push/src/lib.rs index d18a64c..a0dd196 100644 --- a/crates/dav_push/src/lib.rs +++ b/crates/dav_push/src/lib.rs @@ -27,8 +27,8 @@ pub struct ContentUpdate { #[derive(XmlSerialize, XmlRootTag, Debug)] #[xml(root = b"push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")] #[xml(ns_prefix( - rustical_dav::namespace::NS_DAVPUSH = b"", - rustical_dav::namespace::NS_DAV = b"D", + rustical_dav::namespace::NS_DAVPUSH = "", + rustical_dav::namespace::NS_DAV = "D", ))] struct PushMessage { #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")] diff --git a/crates/xml/derive/src/attrs.rs b/crates/xml/derive/src/attrs.rs index 0d4cc11..7695173 100644 --- a/crates/xml/derive/src/attrs.rs +++ b/crates/xml/derive/src/attrs.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use darling::{FromDeriveInput, FromField, FromMeta, FromVariant, util::Flag}; -use syn::{Ident, LitByteStr}; +use syn::{Ident, LitByteStr, LitStr}; #[derive(Debug, Default, FromMeta, Clone)] pub struct TagAttrs { @@ -33,7 +33,7 @@ pub struct StructAttrs { pub root: Option, pub ns: Option, #[darling(default)] - pub ns_prefix: HashMap, + pub ns_prefix: HashMap, pub allow_invalid: Flag, } diff --git a/crates/xml/derive/src/xml_struct/impl_se.rs b/crates/xml/derive/src/xml_struct/impl_se.rs index 0df2bf6..ec5c651 100644 --- a/crates/xml/derive/src/xml_struct/impl_se.rs +++ b/crates/xml/derive/src/xml_struct/impl_se.rs @@ -75,7 +75,7 @@ impl NamedStruct { } else { b"".to_vec() }; - let attr_name = [b"xmlns".as_ref(), &sep, &prefix.value()].concat(); + let attr_name = [b"xmlns".as_ref(), &sep, prefix.value().as_bytes()].concat(); let a = syn::LitByteStr::new(&attr_name, prefix.span()); quote! { bytes_start.push_attribute((#a.as_ref(), #ns.as_ref()));