run clippy fix

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

@@ -3,18 +3,17 @@ use rustical_dav::xml::PropfindType;
 use rustical_ical::{CalendarObject, UtcDateTime};
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_xml::XmlDeserialize;
-use std::ops::Deref;
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
-pub(crate) struct TimeRangeElement {
+pub struct TimeRangeElement {
     #[xml(ty = "attr")]
     pub(crate) start: Option<UtcDateTime>,
     #[xml(ty = "attr")]
     pub(crate) end: Option<UtcDateTime>,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
 // https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
 pub struct ParamFilterElement {
@@ -27,7 +26,7 @@ pub struct ParamFilterElement {
     pub(crate) name: String,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
 pub struct TextMatchElement {
     #[xml(ty = "attr")]
@@ -40,7 +39,7 @@ pub struct TextMatchElement {
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
 // https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
-pub(crate) struct PropFilterElement {
+pub struct PropFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     pub(crate) is_not_defined: Option<()>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
@@ -57,7 +56,7 @@ pub(crate) struct PropFilterElement {
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
 // https://datatracker.ietf.org/doc/html/rfc4791#section-9.7.1
-pub(crate) struct CompFilterElement {
+pub struct CompFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     pub(crate) is_not_defined: Option<()>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
@@ -81,7 +80,7 @@ impl CompFilterElement {
             // Client is asking for something different than a vcalendar
             (None, false) => return false,
             _ => {}
-        };
+        }
 
         if self.time_range.is_some() {
             // <time-range> should be applied on VEVENT/VTODO but not on VCALENDAR
@@ -111,20 +110,20 @@ impl CompFilterElement {
             // Client is asking for something different than a vcalendar
             (None, false) => return false,
             _ => {}
-        };
+        }
 
         // TODO: Implement prop-filter (and comp-filter?) at some point
 
         if let Some(time_range) = &self.time_range {
             if let Some(start) = &time_range.start
                 && let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None)
-                && start.deref() > &last_occurence.utc()
+                && **start > last_occurence.utc()
             {
                 return false;
             }
             if let Some(end) = &time_range.end
                 && let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None)
-                && end.deref() < &first_occurence.utc()
+                && **end < first_occurence.utc()
             {
                 return false;
             }
@@ -136,7 +135,7 @@ impl CompFilterElement {
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
 // https://datatracker.ietf.org/doc/html/rfc4791#section-9.7
-pub(crate) struct FilterElement {
+pub struct FilterElement {
     // This comp-filter matches on VCALENDAR
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     pub(crate) comp_filter: CompFilterElement,
@@ -151,7 +150,7 @@ impl FilterElement {
 impl From<&FilterElement> for CalendarQuery {
     fn from(value: &FilterElement) -> Self {
         let comp_filter_vcalendar = &value.comp_filter;
-        for comp_filter in comp_filter_vcalendar.comp_filter.iter() {
+        for comp_filter in &comp_filter_vcalendar.comp_filter {
             // A calendar object cannot contain both VEVENT and VTODO, so we only have to handle
             // whatever we get first
             if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO")
@@ -159,7 +158,7 @@ impl From<&FilterElement> for CalendarQuery {
             {
                 let start = time_range.start.as_ref().map(|start| start.date_naive());
                 let end = time_range.end.as_ref().map(|end| end.date_naive());
-                return CalendarQuery {
+                return Self {
                     time_start: start,
                     time_end: end,
                 };
@@ -188,7 +187,7 @@ impl From<&CalendarQueryRequest> for CalendarQuery {
         value
             .filter
             .as_ref()
-            .map(CalendarQuery::from)
+            .map(Self::from)
             .unwrap_or_default()
     }
 }

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

@@ -3,7 +3,7 @@ use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 
 mod elements;
-pub(crate) use elements::*;
+pub use elements::*;
 
 pub async fn get_objects_calendar_query<C: CalendarStore>(
     cal_query: &CalendarQueryRequest,