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

fix props deserialization (quick-xml doesn't support untagged enums)

Browse Source
This commit is contained in:
Lennart
2024-11-04 21:10:43 +01:00
parent 2143bc850c
commit ff95d65d44
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/caldav/src/calendar/resource.rs
View File

@@ -81,11 +81,11 @@ pub enum CalendarProp {
// Didn't find the spec // Didn't find the spec
Getctag(String), Getctag(String),
#[serde(skip_deserializing, untagged)] #[serde(skip_deserializing, rename = "$value")]
#[from] #[from]
ExtCommonProperties(CommonPropertiesProp), ExtCommonProperties(CommonPropertiesProp),
#[serde(untagged)] #[serde(other)]
#[default] #[default]
Invalid, Invalid,
} }

4
crates/caldav/src/calendar_object/resource.rs
View File

@@ -39,11 +39,11 @@ pub enum CalendarObjectProp {
#[serde(rename = "C:calendar-data")] #[serde(rename = "C:calendar-data")]
CalendarData(String), CalendarData(String),
#[serde(skip_deserializing, untagged)] #[serde(skip_deserializing, rename = "$value")]
#[from] #[from]
ExtCommonProperties(CommonPropertiesProp), ExtCommonProperties(CommonPropertiesProp),
#[serde(untagged)] #[serde(other)]
#[default] #[default]
Invalid, Invalid,
} }

4
crates/caldav/src/principal/mod.rs
View File

@@ -38,11 +38,11 @@ pub enum PrincipalProp {
#[serde(rename = "C:calendar-user-address-set")] #[serde(rename = "C:calendar-user-address-set")]
CalendarUserAddressSet(HrefElement), CalendarUserAddressSet(HrefElement),
#[serde(skip_deserializing, untagged)] #[serde(skip_deserializing, rename = "$value")]
#[from] #[from]
ExtCommonProperties(CommonPropertiesProp), ExtCommonProperties(CommonPropertiesProp),
#[serde(untagged)] #[serde(other)]
#[default] #[default]
Invalid, Invalid,
} }

4
crates/carddav/src/address_object/resource.rs
View File

@@ -40,11 +40,11 @@ pub enum AddressObjectProp {
#[serde(rename = "CARD:address-data")] #[serde(rename = "CARD:address-data")]
AddressData(String), AddressData(String),
#[serde(skip_deserializing, untagged)] #[serde(skip_deserializing, rename = "$value")]
#[from] #[from]
ExtCommonProperties(CommonPropertiesProp), ExtCommonProperties(CommonPropertiesProp),
#[serde(untagged)] #[serde(other)]
#[default] #[default]
Invalid, Invalid,
} }

4
crates/carddav/src/addressbook/resource.rs
View File

@@ -66,11 +66,11 @@ pub enum AddressbookProp {
// Didn't find the spec // Didn't find the spec
Getctag(String), Getctag(String),
#[serde(skip_deserializing, untagged)] #[serde(skip_deserializing, rename = "$value")]
#[from] #[from]
ExtCommonProperties(CommonPropertiesProp), ExtCommonProperties(CommonPropertiesProp),
#[serde(untagged)] #[serde(other)]
#[default] #[default]
Invalid, Invalid,
} }

4
crates/carddav/src/principal/mod.rs
View File

@@ -38,11 +38,11 @@ pub enum PrincipalProp {
#[serde(rename = "CARD:principal-address")] #[serde(rename = "CARD:principal-address")]
PrincipalAddress(Option<HrefElement>), PrincipalAddress(Option<HrefElement>),
#[serde(skip_deserializing, untagged)] #[serde(skip_deserializing, rename = "$value")]
#[from] #[from]
ExtCommonProperties(CommonPropertiesProp), ExtCommonProperties(CommonPropertiesProp),
#[serde(untagged)] #[serde(other)]
#[default] #[default]
Invalid, Invalid,
} }

2
crates/dav/src/extensions/mod.rs
View File

@@ -33,7 +33,7 @@ pub enum CommonPropertiesProp {
CurrentUserPrivilegeSet(UserPrivilegeSet), CurrentUserPrivilegeSet(UserPrivilegeSet),
Owner(Option<HrefElement>), Owner(Option<HrefElement>),
#[serde(untagged)] #[serde(other)]
Invalid, Invalid,
} }