diff --git a/crates/caldav/src/calendar/methods/report.rs b/crates/caldav/src/calendar/methods/report.rs index 1346c3c..92cac32 100644 --- a/crates/caldav/src/calendar/methods/report.rs +++ b/crates/caldav/src/calendar/methods/report.rs @@ -5,8 +5,8 @@ use actix_web::{ }; use rustical_auth::{AuthInfoExtractor, CheckAuthentication}; use rustical_dav::{ + methods::propfind::{PropElement, PropfindType, ServicePrefix}, namespace::Namespace, - propfind::{PropElement, PropfindType, ServicePrefix}, resource::HandlePropfind, xml::MultistatusElement, }; diff --git a/crates/caldav/src/lib.rs b/crates/caldav/src/lib.rs index a6dedd4..c1fd47c 100644 --- a/crates/caldav/src/lib.rs +++ b/crates/caldav/src/lib.rs @@ -6,9 +6,9 @@ use event::resource::EventResource; use principal::PrincipalResource; use root::RootResource; use rustical_auth::CheckAuthentication; -use rustical_dav::delete::route_delete; -use rustical_dav::propfind::{route_propfind, ServicePrefix}; -use rustical_dav::proppatch::route_proppatch; +use rustical_dav::methods::{ + propfind::ServicePrefix, route_delete, route_propfind, route_proppatch, +}; use rustical_store::CalendarStore; use std::str::FromStr; use std::sync::Arc; diff --git a/crates/dav/src/lib.rs b/crates/dav/src/lib.rs index 793e7ef..f9986d7 100644 --- a/crates/dav/src/lib.rs +++ b/crates/dav/src/lib.rs @@ -1,9 +1,7 @@ -pub mod delete; pub mod depth_extractor; pub mod error; +pub mod methods; pub mod namespace; -pub mod propfind; -pub mod proppatch; pub mod resource; pub mod xml; diff --git a/crates/dav/src/delete.rs b/crates/dav/src/methods/delete.rs similarity index 100% rename from crates/dav/src/delete.rs rename to crates/dav/src/methods/delete.rs diff --git a/crates/dav/src/methods/mod.rs b/crates/dav/src/methods/mod.rs new file mode 100644 index 0000000..5567d67 --- /dev/null +++ b/crates/dav/src/methods/mod.rs @@ -0,0 +1,7 @@ +pub mod delete; +pub mod propfind; +pub mod proppatch; + +pub use delete::route_delete; +pub use propfind::route_propfind; +pub use proppatch::route_proppatch; diff --git a/crates/dav/src/propfind.rs b/crates/dav/src/methods/propfind.rs similarity index 100% rename from crates/dav/src/propfind.rs rename to crates/dav/src/methods/propfind.rs diff --git a/crates/dav/src/proppatch.rs b/crates/dav/src/methods/proppatch.rs similarity index 100% rename from crates/dav/src/proppatch.rs rename to crates/dav/src/methods/proppatch.rs