Lots of clippy appeasement

crates/caldav/src/calendar/methods/get.rs

@@ -32,7 +32,6 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
         return Err(crate::Error::Unauthorized);
     }
 
-    let mut timezones = HashMap::new();
     let mut vtimezones = HashMap::new();
     let objects = cal_store.get_objects(&principal, &calendar_id).await?;
 
@@ -64,31 +63,23 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     for object in &objects {
         vtimezones.extend(object.get_vtimezones());
         match object.get_data() {
-            CalendarObjectComponent::Event(
-                EventObject {
-                    event,
-                    timezones: object_timezones,
-                    ..
-                },
-                overrides,
-            ) => {
-                timezones.extend(object_timezones);
+            CalendarObjectComponent::Event(EventObject { event, .. }, overrides) => {
                 ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
-                for _override in overrides {
+                for ev_override in overrides {
                     ical_calendar_builder =
-                        ical_calendar_builder.add_event(_override.event.clone());
+                        ical_calendar_builder.add_event(ev_override.event.clone());
                 }
             }
             CalendarObjectComponent::Todo(todo, overrides) => {
                 ical_calendar_builder = ical_calendar_builder.add_todo(todo.clone());
-                for _override in overrides {
-                    ical_calendar_builder = ical_calendar_builder.add_todo(_override.clone());
+                for ev_override in overrides {
+                    ical_calendar_builder = ical_calendar_builder.add_todo(ev_override.clone());
                 }
             }
             CalendarObjectComponent::Journal(journal, overrides) => {
                 ical_calendar_builder = ical_calendar_builder.add_journal(journal.clone());
-                for _override in overrides {
-                    ical_calendar_builder = ical_calendar_builder.add_journal(_override.clone());
+                for ev_override in overrides {
+                    ical_calendar_builder = ical_calendar_builder.add_journal(ev_override.clone());
                 }
             }
         }

crates/caldav/src/calendar/methods/mkcalendar.rs

@@ -89,17 +89,12 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
         // TODO: Proper error (calendar-timezone precondition)
         let calendar = IcalParser::new(tz.as_bytes())
             .next()
-            .ok_or(rustical_dav::Error::BadRequest(
-                "No timezone data provided".to_owned(),
-            ))?
+            .ok_or_else(|| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?
             .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
 
-        let timezone = calendar
-            .timezones
-            .first()
-            .ok_or(rustical_dav::Error::BadRequest(
-                "No timezone data provided".to_owned(),
-            ))?;
+        let timezone = calendar.timezones.first().ok_or_else(|| {
+            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
+        })?;
         let timezone: chrono_tz::Tz = timezone
             .try_into()
             .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
@@ -123,14 +118,16 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
         synctoken: 0,
         subscription_url: request.source.map(|href| href.href),
         push_topic: uuid::Uuid::new_v4().to_string(),
-        components: request
-            .supported_calendar_component_set
-            .map(Into::into)
-            .unwrap_or(vec![
-                CalendarObjectType::Event,
-                CalendarObjectType::Todo,
-                CalendarObjectType::Journal,
-            ]),
+        components: request.supported_calendar_component_set.map_or_else(
+            || {
+                vec![
+                    CalendarObjectType::Event,
+                    CalendarObjectType::Todo,
+                    CalendarObjectType::Journal,
+                ]
+            },
+            Into::into,
+        ),
     };
 
     cal_store.insert_calendar(calendar).await?;

crates/caldav/src/calendar/methods/post.rs

@@ -53,7 +53,8 @@ pub async fn route_post<C: CalendarStore, S: SubscriptionStore>(
         push_resource: request
             .subscription
             .web_push_subscription
-            .push_resource.clone(),
+            .push_resource
+            .clone(),
         topic: calendar_resource.cal.push_topic,
         expiration: expires.naive_local(),
         public_key: request

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

@@ -36,11 +36,9 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore>(
                 }
             } else {
                 not_found.push(href.to_owned());
-                continue;
             }
         } else {
             not_found.push(href.to_owned());
-            continue;
         }
     }
 

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

@@ -36,7 +36,7 @@ pub struct TextMatchElement {
     pub(crate) negate_condition: Option<String>,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
 // https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
 pub struct PropFilterElement {
@@ -76,7 +76,7 @@ impl CompFilterElement {
         let comp_vcal = self.name == "VCALENDAR";
         match (self.is_not_defined, comp_vcal) {
             // Client wants VCALENDAR to not exist but we are a VCALENDAR
-            (Some(()), true) => return false,
+            (Some(()), true) |
             // Client is asking for something different than a vcalendar
             (None, false) => return false,
             _ => {}
@@ -106,7 +106,7 @@ impl CompFilterElement {
         let comp_name_matches = self.name == cal_object.get_component_name();
         match (self.is_not_defined, comp_name_matches) {
             // Client wants VCALENDAR to not exist but we are a VCALENDAR
-            (Some(()), true) => return false,
+            (Some(()), true) |
             // Client is asking for something different than a vcalendar
             (None, false) => return false,
             _ => {}
@@ -164,7 +164,7 @@ impl From<&FilterElement> for CalendarQuery {
                 };
             }
         }
-        Default::default()
+        Self::default()
     }
 }
 
@@ -184,10 +184,6 @@ pub struct CalendarQueryRequest {
 
 impl From<&CalendarQueryRequest> for CalendarQuery {
     fn from(value: &CalendarQueryRequest) -> Self {
-        value
-            .filter
-            .as_ref()
-            .map(Self::from)
-            .unwrap_or_default()
+        value.filter.as_ref().map(Self::from).unwrap_or_default()
     }
 }

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

@@ -33,7 +33,7 @@ mod tests {
                 PropFilterElement, TextMatchElement,
             },
         },
-        calendar_object::{CalendarObjectPropName, CalendarObjectPropWrapperName},
+        calendar_object::{CalendarData, CalendarObjectPropName, CalendarObjectPropWrapperName},
     };
 
     #[test]
@@ -76,7 +76,7 @@ mod tests {
                             CalendarObjectPropName::Getetag,
                         ),
                         CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::CalendarData(Default::default())
+                            CalendarObjectPropName::CalendarData(CalendarData::default())
                         ),
                     ],
                     vec![]
@@ -115,6 +115,6 @@ mod tests {
                 timezone: None,
                 timezone_id: None
             }
-        )
+        );
     }
 }

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

@@ -43,9 +43,9 @@ pub(crate) enum ReportRequest {
 impl ReportRequest {
     const fn props(&self) -> &PropfindType<CalendarObjectPropWrapperName> {
         match &self {
-            Self::CalendarMultiget(CalendarMultigetRequest { prop, .. }) => prop,
-            Self::CalendarQuery(CalendarQueryRequest { prop, .. }) => prop,
-            Self::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
+            Self::CalendarMultiget(CalendarMultigetRequest { prop, .. })
+            | Self::CalendarQuery(CalendarQueryRequest { prop, .. })
+            | Self::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
         }
     }
 }
@@ -184,7 +184,7 @@ mod tests {
                     "/caldav/user/user/6f787542-5256-401a-8db97003260da/ae7a998fdfd1d84a20391168962c62b".to_owned()
                 ]
             })
-        )
+        );
     }
 
     #[test]
@@ -241,7 +241,7 @@ mod tests {
                 timezone: None,
                 timezone_id: None,
             })
-        )
+        );
     }
 
     #[test]
@@ -269,6 +269,6 @@ mod tests {
                     "/caldav/user/user/6f787542-5256-401a-8db97003260da/ae7a998fdfd1d84a20391168962c62b".to_owned()
                 ]
             })
-        )
+        );
     }
 }