diff --git a/crates/caldav/src/principal/mod.rs b/crates/caldav/src/principal/mod.rs index a74ec0b..6bb86fe 100644 --- a/crates/caldav/src/principal/mod.rs +++ b/crates/caldav/src/principal/mod.rs @@ -5,11 +5,11 @@ use anyhow::anyhow; use async_trait::async_trait; use rustical_auth::AuthInfo; use rustical_dav::resource::{InvalidProperty, Resource, ResourceService}; -use rustical_dav::xml_snippets::HrefElement; +use rustical_dav::xml::HrefElement; use rustical_store::CalendarStore; use serde::{Deserialize, Serialize}; use std::sync::Arc; -use strum::{AsRefStr, EnumString, VariantNames}; +use strum::{EnumString, VariantNames}; use tokio::sync::RwLock; use crate::calendar::resource::CalendarFile; @@ -54,7 +54,7 @@ impl InvalidProperty for PrincipalProp { } } -#[derive(EnumString, Debug, VariantNames, AsRefStr, Clone)] +#[derive(EnumString, Debug, VariantNames, Clone)] #[strum(serialize_all = "kebab-case")] pub enum PrincipalPropName { Resourcetype, diff --git a/crates/caldav/src/root/mod.rs b/crates/caldav/src/root/mod.rs index 2bdd3e6..d53a747 100644 --- a/crates/caldav/src/root/mod.rs +++ b/crates/caldav/src/root/mod.rs @@ -3,16 +3,16 @@ use actix_web::HttpRequest; use async_trait::async_trait; use rustical_auth::AuthInfo; use rustical_dav::resource::{InvalidProperty, Resource, ResourceService}; -use rustical_dav::xml_snippets::HrefElement; +use rustical_dav::xml::HrefElement; use serde::{Deserialize, Serialize}; -use strum::{EnumString, IntoStaticStr, VariantNames}; +use strum::{EnumString, VariantNames}; pub struct RootResource { principal: String, path: String, } -#[derive(EnumString, Debug, VariantNames, IntoStaticStr, Clone)] +#[derive(EnumString, Debug, VariantNames, Clone)] #[strum(serialize_all = "kebab-case")] pub enum RootPropName { Resourcetype,