fix some dumb design decisions

crates/carddav/src/address_object/resource.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use derive_more::derive::{From, Into, TryInto};
 use rustical_dav::{
     extension::BoxedExtension,
-    extensions::{CommonPropertiesExtension, CommonPropertiesProp, CommonPropertiesPropName},
+    extensions::{CommonPropertiesExtension, CommonPropertiesProp},
     privileges::UserPrivilegeSet,
     resource::{InvalidProperty, Resource, ResourceService},
 };
@@ -23,16 +23,12 @@ pub struct AddressObjectResourceService<AS: AddressbookStore + ?Sized> {
     pub object_id: String,
 }
 
-#[derive(EnumString, VariantNames, Clone, From, TryInto)]
+#[derive(EnumString, VariantNames, Clone)]
 #[strum(serialize_all = "kebab-case")]
 pub enum AddressObjectPropName {
     Getetag,
     AddressData,
     Getcontenttype,
-    #[from]
-    #[try_into]
-    #[strum(disabled)]
-    ExtCommonProperties(CommonPropertiesPropName),
 }
 
 #[derive(Deserialize, Serialize, From, TryInto)]
@@ -100,7 +96,6 @@ impl Resource for AddressObjectResource {
             AddressObjectPropName::Getcontenttype => {
                 AddressObjectProp::Getcontenttype("text/vcard;charset=utf-8".to_owned())
             }
-            _ => panic!("we shouldn't end up here"),
         })
     }
 

crates/carddav/src/addressbook/resource.rs

@@ -11,9 +11,7 @@ use actix_web::{web::Data, HttpRequest};
 use async_trait::async_trait;
 use derive_more::derive::{From, Into, TryInto};
 use rustical_dav::extension::BoxedExtension;
-use rustical_dav::extensions::{
-    CommonPropertiesExtension, CommonPropertiesProp, CommonPropertiesPropName,
-};
+use rustical_dav::extensions::{CommonPropertiesExtension, CommonPropertiesProp};
 use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
 use rustical_store::auth::User;
@@ -30,7 +28,7 @@ pub struct AddressbookResourceService<AS: AddressbookStore + ?Sized> {
     pub addressbook_id: String,
 }
 
-#[derive(EnumString, VariantNames, Clone, From, TryInto)]
+#[derive(EnumString, VariantNames, Clone)]
 #[strum(serialize_all = "kebab-case")]
 pub enum AddressbookPropName {
     Displayname,
@@ -41,9 +39,6 @@ pub enum AddressbookPropName {
     MaxResourceSize,
     SyncToken,
     Getctag,
-    #[try_into]
-    #[strum(disabled)]
-    ExtCommonProperties(CommonPropertiesPropName),
 }
 
 #[derive(Deserialize, Serialize, From, TryInto)]
@@ -128,7 +123,6 @@ impl Resource for AddressbookResource {
             }
             AddressbookPropName::SyncToken => AddressbookProp::SyncToken(self.0.format_synctoken()),
             AddressbookPropName::Getctag => AddressbookProp::Getctag(self.0.format_synctoken()),
-            _ => panic!("we shouldn't end up here"),
         })
     }
 
@@ -169,7 +163,6 @@ impl Resource for AddressbookResource {
             AddressbookPropName::SupportedAddressData => Err(rustical_dav::Error::PropReadOnly),
             AddressbookPropName::SyncToken => Err(rustical_dav::Error::PropReadOnly),
             AddressbookPropName::Getctag => Err(rustical_dav::Error::PropReadOnly),
-            _ => panic!("we shouldn't end up here"),
         }
     }
 

crates/carddav/src/principal/mod.rs

@@ -6,9 +6,7 @@ use actix_web::HttpRequest;
 use async_trait::async_trait;
 use derive_more::derive::{From, TryInto};
 use rustical_dav::extension::BoxedExtension;
-use rustical_dav::extensions::{
-    CommonPropertiesExtension, CommonPropertiesProp, CommonPropertiesPropName,
-};
+use rustical_dav::extensions::{CommonPropertiesExtension, CommonPropertiesProp};
 use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
 use rustical_dav::xml::HrefElement;
@@ -70,10 +68,6 @@ pub enum PrincipalPropName {
     PrincipalUrl,
     AddressbookHomeSet,
     PrincipalAddress,
-    #[from]
-    #[try_into]
-    #[strum(disabled)]
-    ExtCommonProperties(CommonPropertiesPropName),
 }
 
 impl PrincipalResource {
@@ -108,7 +102,6 @@ impl Resource for PrincipalResource {
                 PrincipalProp::AddressbookHomeSet(principal_href)
             }
             PrincipalPropName::PrincipalAddress => PrincipalProp::PrincipalAddress(None),
-            _ => panic!("we shouldn't end up here"),
         })
     }