Refactoring

crates/caldav/src/calendar/methods/report/calendar_query.rs

@@ -1,9 +1,8 @@
 use actix_web::HttpRequest;
 use chrono::{DateTime, Utc};
 use rustical_dav::{
-    methods::propfind::{PropElement, PropfindType},
     resource::{CommonPropertiesProp, EitherProp, Resource},
-    xml::{multistatus::PropstatWrapper, MultistatusElement},
+    xml::{MultistatusElement, PropElement, PropfindType},
 };
 use rustical_store::{auth::User, CalendarObject, CalendarStore};
 use serde::Deserialize;
@@ -210,13 +209,8 @@ pub async fn handle_calendar_query<C: CalendarStore + ?Sized>(
     principal: &str,
     cal_id: &str,
     cal_store: &C,
-) -> Result<
-    MultistatusElement<
-        PropstatWrapper<EitherProp<CalendarObjectProp, CommonPropertiesProp>>,
-        String,
-    >,
-    Error,
-> {
+) -> Result<MultistatusElement<EitherProp<CalendarObjectProp, CommonPropertiesProp>, String>, Error>
+{
     let objects = get_objects_calendar_query(&cal_query, principal, cal_id, cal_store).await?;
 
     let props = match cal_query.prop {