diff --git a/crates/caldav/src/resources/calendar.rs b/crates/caldav/src/resources/calendar.rs index d035a72..0cbf282 100644 --- a/crates/caldav/src/resources/calendar.rs +++ b/crates/caldav/src/resources/calendar.rs @@ -2,8 +2,8 @@ use actix_web::{web::Data, HttpRequest}; use anyhow::{anyhow, Result}; use async_trait::async_trait; use rustical_auth::AuthInfo; -use rustical_dav::dav_resource::{Resource, ResourceService}; use rustical_dav::error::Error; +use rustical_dav::resource::{Resource, ResourceService}; use rustical_dav::xml_snippets::{HrefElement, TextNode}; use rustical_store::calendar::{Calendar, CalendarStore}; use serde::Serialize; diff --git a/crates/caldav/src/resources/event.rs b/crates/caldav/src/resources/event.rs index 4e2bb48..952a788 100644 --- a/crates/caldav/src/resources/event.rs +++ b/crates/caldav/src/resources/event.rs @@ -2,9 +2,9 @@ use actix_web::{web::Data, HttpRequest}; use anyhow::{anyhow, Result}; use async_trait::async_trait; use rustical_auth::AuthInfo; -use rustical_dav::dav_resource::Resource; +use rustical_dav::error::Error; +use rustical_dav::resource::{Resource, ResourceService}; use rustical_dav::xml_snippets::TextNode; -use rustical_dav::{dav_resource::ResourceService, error::Error}; use rustical_store::calendar::CalendarStore; use rustical_store::event::Event; use serde::Serialize; diff --git a/crates/caldav/src/resources/principal.rs b/crates/caldav/src/resources/principal.rs index 1f6935e..22d3980 100644 --- a/crates/caldav/src/resources/principal.rs +++ b/crates/caldav/src/resources/principal.rs @@ -5,7 +5,7 @@ use actix_web::HttpRequest; use anyhow::{anyhow, Result}; use async_trait::async_trait; use rustical_auth::AuthInfo; -use rustical_dav::dav_resource::{Resource, ResourceService}; +use rustical_dav::resource::{Resource, ResourceService}; use rustical_dav::xml_snippets::HrefElement; use rustical_store::calendar::CalendarStore; use serde::Serialize; diff --git a/crates/caldav/src/resources/root.rs b/crates/caldav/src/resources/root.rs index dfebb27..be5b786 100644 --- a/crates/caldav/src/resources/root.rs +++ b/crates/caldav/src/resources/root.rs @@ -2,8 +2,8 @@ use actix_web::HttpRequest; use anyhow::Result; use async_trait::async_trait; use rustical_auth::AuthInfo; -use rustical_dav::dav_resource::{Resource, ResourceService}; use rustical_dav::error::Error; +use rustical_dav::resource::{Resource, ResourceService}; use rustical_dav::xml_snippets::HrefElement; use serde::Serialize; use strum::{EnumString, IntoStaticStr, VariantNames}; diff --git a/crates/caldav/src/routes/calendar.rs b/crates/caldav/src/routes/calendar.rs index 62fd4af..edd57ae 100644 --- a/crates/caldav/src/routes/calendar.rs +++ b/crates/caldav/src/routes/calendar.rs @@ -7,9 +7,9 @@ use actix_web::HttpResponse; use anyhow::Result; use roxmltree::{Node, NodeType}; use rustical_auth::{AuthInfoExtractor, CheckAuthentication}; -use rustical_dav::dav_resource::HandlePropfind; use rustical_dav::namespace::Namespace; use rustical_dav::propfind::ServicePrefix; +use rustical_dav::resource::HandlePropfind; use rustical_dav::xml_snippets::generate_multistatus; use rustical_store::calendar::{Calendar, CalendarStore}; use rustical_store::event::Event; diff --git a/crates/dav/src/lib.rs b/crates/dav/src/lib.rs index 2d5b4b3..dc7b87b 100644 --- a/crates/dav/src/lib.rs +++ b/crates/dav/src/lib.rs @@ -1,6 +1,6 @@ -pub mod dav_resource; pub mod depth_extractor; pub mod error; pub mod namespace; pub mod propfind; +pub mod resource; pub mod xml_snippets; diff --git a/crates/dav/src/propfind.rs b/crates/dav/src/propfind.rs index 3ec6f26..633e2bf 100644 --- a/crates/dav/src/propfind.rs +++ b/crates/dav/src/propfind.rs @@ -1,7 +1,7 @@ -use crate::dav_resource::HandlePropfind; -use crate::dav_resource::ResourceService; use crate::depth_extractor::Depth; use crate::namespace::Namespace; +use crate::resource::HandlePropfind; +use crate::resource::ResourceService; use crate::xml_snippets::generate_multistatus; use actix_web::http::header::ContentType; use actix_web::http::StatusCode; diff --git a/crates/dav/src/dav_resource.rs b/crates/dav/src/resource.rs similarity index 100% rename from crates/dav/src/dav_resource.rs rename to crates/dav/src/resource.rs