version 0.10.0

addresses #135

.sqlx/query-3a29efff3d3f6e1e05595d1a2d095af5fc963572c90bd10a6616af78757f8c39.json

@@ -0,0 +1,32 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT id, uid, ics FROM calendarobjects\n                WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL\n                    AND (last_occurence IS NULL OR ? IS NULL OR last_occurence >= date(?))\n                    AND (first_occurence IS NULL OR ? IS NULL OR first_occurence <= date(?))\n            ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "uid",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "ics",
+        "ordinal": 2,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 6
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "3a29efff3d3f6e1e05595d1a2d095af5fc963572c90bd10a6616af78757f8c39"
+}

.sqlx/query-3e1cca532372e891ab3e604ecb79311d8cd64108d4f238db4c79e9467a3b6d2e.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "REPLACE INTO calendarobjects (principal, cal_id, id, ics, first_occurence, last_occurence, etag, object_type) VALUES (?, ?, ?, ?, date(?), date(?), ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 8
-    },
-    "nullable": []
-  },
-  "hash": "3e1cca532372e891ab3e604ecb79311d8cd64108d4f238db4c79e9467a3b6d2e"
-}

.sqlx/query-505ebe8e64ac709b230dce7150240965e45442aca6c5f3b3115738ef508939ed.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT id, ics FROM calendarobjects WHERE (principal, cal_id, id) = (?, ?, ?) AND ((deleted_at IS NULL) OR ?)",
+  "query": "SELECT id, uid, ics FROM calendarobjects WHERE (principal, cal_id, id) = (?, ?, ?) AND ((deleted_at IS NULL) OR ?)",
   "describe": {
     "columns": [
       {
@@ -9,18 +9,24 @@
         "type_info": "Text"
       },
       {
-        "name": "ics",
+        "name": "uid",
         "ordinal": 1,
         "type_info": "Text"
+      },
+      {
+        "name": "ics",
+        "ordinal": 2,
+        "type_info": "Text"
       }
     ],
     "parameters": {
       "Right": 4
     },
     "nullable": [
+      false,
       false,
       false
     ]
   },
-  "hash": "543838c030550cb09d1af08adfeade8b7ce3575d92fddbc6e9582d141bc9e49d"
+  "hash": "505ebe8e64ac709b230dce7150240965e45442aca6c5f3b3115738ef508939ed"
 }

.sqlx/query-6327bee90e5df01536a0ddb15adcc37af3027f6902aa3786365c5ab2fbf06bda.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO calendarobjects (principal, cal_id, id, ics, first_occurence, last_occurence, etag, object_type) VALUES (?, ?, ?, ?, date(?), date(?), ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 8
-    },
-    "nullable": []
-  },
-  "hash": "6327bee90e5df01536a0ddb15adcc37af3027f6902aa3786365c5ab2fbf06bda"
-}

.sqlx/query-804ed2a4a7032e9605d1871297498f5a96de0fc816ce660c705fb28318be0d42.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT id, ics FROM calendarobjects WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL",
+  "query": "SELECT id, uid, ics FROM calendarobjects WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL",
   "describe": {
     "columns": [
       {
@@ -9,18 +9,24 @@
         "type_info": "Text"
       },
       {
-        "name": "ics",
+        "name": "uid",
         "ordinal": 1,
         "type_info": "Text"
+      },
+      {
+        "name": "ics",
+        "ordinal": 2,
+        "type_info": "Text"
       }
     ],
     "parameters": {
       "Right": 2
     },
     "nullable": [
+      false,
       false,
       false
     ]
   },
-  "hash": "54c9c0e36a52e6963f11c6aa27f13aafb4204b8aa34b664fd825bd447db80e86"
+  "hash": "804ed2a4a7032e9605d1871297498f5a96de0fc816ce660c705fb28318be0d42"
 }

.sqlx/query-a68a1b96189b854a7ba2a3cd866ba583af5ad84bc1cd8b20cb805e9ce3bad820.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "REPLACE INTO calendarobjects (principal, cal_id, id, uid, ics, first_occurence, last_occurence, etag, object_type) VALUES (?, ?, ?, ?, ?, date(?), date(?), ?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 9
+    },
+    "nullable": []
+  },
+  "hash": "a68a1b96189b854a7ba2a3cd866ba583af5ad84bc1cd8b20cb805e9ce3bad820"
+}

.sqlx/query-c550dbf3d5ce7069f28d767ea9045e477ef8d29d6186851760757a06dec42339.json

@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT id, ics FROM calendarobjects\n                WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL\n                    AND (last_occurence IS NULL OR ? IS NULL OR last_occurence >= date(?))\n                    AND (first_occurence IS NULL OR ? IS NULL OR first_occurence <= date(?))\n            ",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "ics",
-        "ordinal": 1,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 6
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "c550dbf3d5ce7069f28d767ea9045e477ef8d29d6186851760757a06dec42339"
-}

.sqlx/query-d498a758ed707408b00b7d2675250ea739a681ce1f009f05e97f2e101bd7e556.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "INSERT INTO calendarobjects (principal, cal_id, id, uid, ics, first_occurence, last_occurence, etag, object_type) VALUES (?, ?, ?, ?, ?, date(?), date(?), ?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 9
+    },
+    "nullable": []
+  },
+  "hash": "d498a758ed707408b00b7d2675250ea739a681ce1f009f05e97f2e101bd7e556"
+}

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.9.12"
+version = "0.10.0"
 edition = "2024"
 description = "A CalDAV server"
 documentation = "https://lennart-k.github.io/rustical/"
@@ -35,7 +35,7 @@ opentelemetry = [
 debug = 0
 
 [workspace.dependencies]
-matchit = "0.8"
+matchit = "0.9"
 uuid = { version = "1.11", features = ["v4", "fast-rng"] }
 async-trait = "0.1"
 axum = "0.8"
@@ -48,7 +48,6 @@ pbkdf2 = { version = "0.12", features = ["simple"] }
 rand_core = { version = "0.9", features = ["std"] }
 chrono = { version = "0.4", features = ["serde"] }
 regex = "1.10"
-lazy_static = "1.5"
 rstest = "0.26"
 rstest_reuse = "0.7"
 sha2 = "0.10"
@@ -122,7 +121,7 @@ rustical_ical = { path = "./crates/ical/" }
 chrono-tz = "0.10"
 chrono-humanize = "0.2"
 rand = "0.9"
-axum-extra = { version = "0.10", features = ["typed-header"] }
+axum-extra = { version = "0.12", features = ["typed-header"] }
 rrule = "0.14"
 argon2 = "0.5"
 rpassword = "7.3"
@@ -139,7 +138,7 @@ reqwest = { version = "0.12", features = [
 ], default-features = false }
 openidconnect = "4.0"
 clap = { version = "4.5", features = ["derive", "env"] }
-matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "f0591d13" }
+matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "e18e65d7" }
 vtimezones-rs = "0.2"
 ece = { version = "2.3", default-features = false, features = [
   "backend-openssl",

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM rust:1.90-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.91-alpine AS chef
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -47,3 +47,5 @@ ENV RUSTICAL_DATA_STORE__SQLITE__DB_URL=/var/lib/rustical/db.sqlite3
 LABEL org.opencontainers.image.authors="Lennart K github.com/lennart-k"
 LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
 EXPOSE 4000
+
+HEALTHCHECK --interval=30s --timeout=30s --start-period=3s --retries=3 CMD ["/usr/local/bin/rustical", "health"]

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/import.rs

@@ -45,13 +45,13 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     // Extract calendar metadata
     let displayname = cal
         .get_property("X-WR-CALNAME")
-        .and_then(|prop| prop.value.to_owned());
+        .and_then(|prop| prop.value.clone());
     let description = cal
         .get_property("X-WR-CALDESC")
-        .and_then(|prop| prop.value.to_owned());
+        .and_then(|prop| prop.value.clone());
     let timezone_id = cal
         .get_property("X-WR-TIMEZONE")
-        .and_then(|prop| prop.value.to_owned());
+        .and_then(|prop| prop.value.clone());
     // These properties should not appear in the expanded calendar objects
     cal.remove_property("X-WR-CALNAME");
     cal.remove_property("X-WR-CALDESC");
@@ -82,7 +82,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
     let objects = expanded_cals
         .into_iter()
         .map(|cal| cal.generate())
-        .map(CalendarObject::from_ics)
+        .map(|ics| CalendarObject::from_ics(ics, None))
         .collect::<Result<Vec<_>, _>>()?;
     let new_cal = Calendar {
         principal,

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

@@ -79,8 +79,8 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
         _ => unreachable!("We never call with another method"),
     };
 
-    if let Some("") = request.displayname.as_deref() {
-        request.displayname = None
+    if request.displayname.as_deref() == Some("") {
+        request.displayname = None;
     }
 
     let timezone_id = if let Some(tzid) = request.calendar_timezone_id {
@@ -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()))?;
@@ -110,8 +105,8 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
     };
 
     let calendar = Calendar {
-        id: cal_id.to_owned(),
-        principal: principal.to_owned(),
+        id: cal_id.clone(),
+        principal: principal.clone(),
         meta: CalendarMetadata {
             order: request.calendar_order.unwrap_or(0),
             displayname: request.displayname,
@@ -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

@@ -49,12 +49,12 @@ pub async fn route_post<C: CalendarStore, S: SubscriptionStore>(
     };
 
     let subscription = Subscription {
-        id: sub_id.to_owned(),
+        id: sub_id.clone(),
         push_resource: request
             .subscription
             .web_push_subscription
             .push_resource
-            .to_owned(),
+            .clone(),
         topic: calendar_resource.cal.push_topic,
         expiration: expires.naive_local(),
         public_key: request

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

@@ -4,10 +4,10 @@ use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_xml::XmlDeserialize;
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
 // <!ELEMENT calendar-query ((DAV:allprop | DAV:propname | DAV:prop)?, href+)>
-pub(crate) struct CalendarMultigetRequest {
+pub struct CalendarMultigetRequest {
     #[xml(ty = "untagged")]
     pub(crate) prop: PropfindType<CalendarObjectPropWrapperName>,
     #[xml(flatten)]
@@ -27,20 +27,18 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore>(
 
     for href in &cal_query.href {
         if let Some(filename) = href.strip_prefix(path) {
-            let filename = filename.trim_start_matches("/");
+            let filename = filename.trim_start_matches('/');
             if let Some(object_id) = filename.strip_suffix(".ics") {
                 match store.get_object(principal, cal_id, object_id, false).await {
                     Ok(object) => result.push(object),
                     Err(rustical_store::Error::NotFound) => not_found.push(href.to_owned()),
                     Err(err) => return Err(err.into()),
-                };
+                }
             } 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

@@ -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")]
@@ -37,10 +36,10 @@ 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(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")]
@@ -77,11 +76,11 @@ 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,
             _ => {}
-        };
+        }
 
         if self.time_range.is_some() {
             // <time-range> should be applied on VEVENT/VTODO but not on VCALENDAR
@@ -107,24 +106,24 @@ 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,
             _ => {}
-        };
+        }
 
         // 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,13 +158,13 @@ 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,
                 };
             }
         }
-        Default::default()
+        Self::default()
     }
 }
 
@@ -185,10 +184,6 @@ pub struct CalendarQueryRequest {
 
 impl From<&CalendarQueryRequest> for CalendarQuery {
     fn from(value: &CalendarQueryRequest) -> Self {
-        value
-            .filter
-            .as_ref()
-            .map(CalendarQuery::from)
-            .unwrap_or_default()
+        value.filter.as_ref().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,
@@ -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

@@ -41,11 +41,11 @@ pub(crate) enum ReportRequest {
 }
 
 impl ReportRequest {
-    fn props(&self) -> &PropfindType<CalendarObjectPropWrapperName> {
+    const fn props(&self) -> &PropfindType<CalendarObjectPropWrapperName> {
         match &self {
-            ReportRequest::CalendarMultiget(CalendarMultigetRequest { prop, .. }) => prop,
-            ReportRequest::CalendarQuery(CalendarQueryRequest { prop, .. }) => prop,
-            ReportRequest::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()
                 ]
             })
-        )
+        );
     }
 }

crates/caldav/src/calendar/prop.rs

@@ -3,13 +3,13 @@ use rustical_ical::CalendarObjectType;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;
 
-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, From, Into)]
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq, From, Into)]
 pub struct SupportedCalendarComponent {
     #[xml(ty = "attr")]
     pub name: CalendarObjectType,
 }
 
-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq)]
 pub struct SupportedCalendarComponentSet {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     pub comp: Vec<SupportedCalendarComponent>,
@@ -36,7 +36,7 @@ impl From<SupportedCalendarComponentSet> for Vec<CalendarObjectType> {
     }
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
 pub struct CalendarData {
     #[xml(ty = "attr")]
     content_type: String,
@@ -53,13 +53,13 @@ impl Default for CalendarData {
     }
 }
 
-#[derive(Debug, Clone, XmlSerialize, Default, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, Default, PartialEq, Eq)]
 pub struct SupportedCalendarData {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     calendar_data: CalendarData,
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq, VariantArray)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq, VariantArray)]
 pub enum ReportMethod {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     CalendarQuery,

crates/caldav/src/calendar/resource.rs

@@ -18,7 +18,7 @@ use rustical_xml::{EnumVariants, PropName};
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use serde::Deserialize;
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropName")]
 pub enum CalendarProp {
     // CalDAV (RFC 4791)
@@ -54,7 +54,7 @@ pub enum CalendarProp {
     MaxDateTime(String),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropWrapperName", untagged)]
 pub enum CalendarPropWrapper {
     Calendar(CalendarProp),
@@ -71,7 +71,7 @@ pub struct CalendarResource {
 
 impl ResourceName for CalendarResource {
     fn get_name(&self) -> String {
-        self.cal.id.to_owned()
+        self.cal.id.clone()
     }
 }
 
@@ -89,7 +89,7 @@ impl SyncTokenExtension for CalendarResource {
 
 impl DavPushExtension for CalendarResource {
     fn get_topic(&self) -> String {
-        self.cal.push_topic.to_owned()
+        self.cal.push_topic.clone()
     }
 }
 
@@ -135,7 +135,9 @@ impl Resource for CalendarResource {
                 }
                 CalendarPropName::CalendarTimezone => {
                     CalendarProp::CalendarTimezone(self.cal.timezone_id.as_ref().and_then(|tzid| {
-                        vtimezones_rs::VTIMEZONES.get(tzid).map(|tz| tz.to_string())
+                        vtimezones_rs::VTIMEZONES
+                            .get(tzid)
+                            .map(|tz| (*tz).to_string())
                     }))
                 }
                 // chrono_tz uses the IANA database
@@ -154,13 +156,13 @@ impl Resource for CalendarResource {
                 CalendarPropName::SupportedCalendarData => {
                     CalendarProp::SupportedCalendarData(SupportedCalendarData::default())
                 }
-                CalendarPropName::MaxResourceSize => CalendarProp::MaxResourceSize(10000000),
+                CalendarPropName::MaxResourceSize => CalendarProp::MaxResourceSize(10_000_000),
                 CalendarPropName::SupportedReportSet => {
                     CalendarProp::SupportedReportSet(SupportedReportSet::all())
                 }
-                CalendarPropName::Source => CalendarProp::Source(
-                    self.cal.subscription_url.to_owned().map(HrefElement::from),
-                ),
+                CalendarPropName::Source => {
+                    CalendarProp::Source(self.cal.subscription_url.clone().map(HrefElement::from))
+                }
                 CalendarPropName::MinDateTime => {
                     CalendarProp::MinDateTime(CalDateTime::from(DateTime::<Utc>::MIN_UTC).format())
                 }
@@ -199,22 +201,20 @@ impl Resource for CalendarResource {
                         // 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())
                         })?;
@@ -223,7 +223,6 @@ impl Resource for CalendarResource {
                     }
                     Ok(())
                 }
-                CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                 CalendarProp::CalendarTimezoneId(timezone_id) => {
                     if let Some(tzid) = &timezone_id
                         && !vtimezones_rs::VTIMEZONES.contains_key(tzid)
@@ -243,13 +242,13 @@ impl Resource for CalendarResource {
                     self.cal.components = comp_set.into();
                     Ok(())
                 }
-                CalendarProp::SupportedCalendarData(_) => Err(rustical_dav::Error::PropReadOnly),
-                CalendarProp::MaxResourceSize(_) => Err(rustical_dav::Error::PropReadOnly),
-                CalendarProp::SupportedReportSet(_) => Err(rustical_dav::Error::PropReadOnly),
-                // Converting between a calendar subscription calendar and a normal one would be weird
-                CalendarProp::Source(_) => Err(rustical_dav::Error::PropReadOnly),
-                CalendarProp::MinDateTime(_) => Err(rustical_dav::Error::PropReadOnly),
-                CalendarProp::MaxDateTime(_) => Err(rustical_dav::Error::PropReadOnly),
+                CalendarProp::TimezoneServiceSet(_)
+                | CalendarProp::SupportedCalendarData(_)
+                | CalendarProp::MaxResourceSize(_)
+                | CalendarProp::SupportedReportSet(_)
+                | CalendarProp::Source(_)
+                | CalendarProp::MinDateTime(_)
+                | CalendarProp::MaxDateTime(_) => Err(rustical_dav::Error::PropReadOnly),
             },
             CalendarPropWrapper::SyncToken(prop) => SyncTokenExtension::set_prop(self, prop),
             CalendarPropWrapper::DavPush(prop) => DavPushExtension::set_prop(self, prop),
@@ -275,7 +274,6 @@ impl Resource for CalendarResource {
                     self.cal.timezone_id = None;
                     Ok(())
                 }
-                CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
                 CalendarPropName::CalendarOrder => {
                     self.cal.meta.order = 0;
                     Ok(())
@@ -283,13 +281,13 @@ impl Resource for CalendarResource {
                 CalendarPropName::SupportedCalendarComponentSet => {
                     Err(rustical_dav::Error::PropReadOnly)
                 }
-                CalendarPropName::SupportedCalendarData => Err(rustical_dav::Error::PropReadOnly),
-                CalendarPropName::MaxResourceSize => Err(rustical_dav::Error::PropReadOnly),
-                CalendarPropName::SupportedReportSet => Err(rustical_dav::Error::PropReadOnly),
-                // Converting a calendar subscription calendar into a normal one would be weird
-                CalendarPropName::Source => Err(rustical_dav::Error::PropReadOnly),
-                CalendarPropName::MinDateTime => Err(rustical_dav::Error::PropReadOnly),
-                CalendarPropName::MaxDateTime => Err(rustical_dav::Error::PropReadOnly),
+                CalendarPropName::TimezoneServiceSet
+                | CalendarPropName::SupportedCalendarData
+                | CalendarPropName::MaxResourceSize
+                | CalendarPropName::SupportedReportSet
+                | CalendarPropName::Source
+                | CalendarPropName::MinDateTime
+                | CalendarPropName::MaxDateTime => Err(rustical_dav::Error::PropReadOnly),
             },
             CalendarPropWrapperName::SyncToken(prop) => SyncTokenExtension::remove_prop(self, prop),
             CalendarPropWrapperName::DavPush(prop) => DavPushExtension::remove_prop(self, prop),

crates/caldav/src/calendar/service.rs

@@ -35,7 +35,7 @@ impl<C: CalendarStore, S: SubscriptionStore> Clone for CalendarResourceService<C
 }
 
 impl<C: CalendarStore, S: SubscriptionStore> CalendarResourceService<C, S> {
-    pub fn new(cal_store: Arc<C>, sub_store: Arc<S>) -> Self {
+    pub const fn new(cal_store: Arc<C>, sub_store: Arc<S>) -> Self {
         Self {
             cal_store,
             sub_store,

crates/caldav/src/calendar_object/methods.rs

@@ -11,7 +11,7 @@ use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_store::auth::Principal;
 use std::str::FromStr;
-use tracing::{debug, error, instrument};
+use tracing::{debug, instrument};
 
 #[instrument(skip(cal_store))]
 pub async fn get_event<C: CalendarStore>(
@@ -78,21 +78,10 @@ pub async fn put_event<C: CalendarStore>(
         true
     };
 
-    let object = match CalendarObject::from_ics(body.clone()) {
-        Ok(obj) => obj,
-        Err(_) => {
-            debug!("invalid calendar data:\n{body}");
-            return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
-        }
+    let Ok(object) = CalendarObject::from_ics(body.clone(), Some(object_id)) else {
+        debug!("invalid calendar data:\n{body}");
+        return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
     };
-    if object.get_id() != object_id {
-        error!(
-            "Calendar object UID and file name not matching: UID={}, filename={}",
-            object.get_id(),
-            object_id
-        );
-        return Err(Error::PreconditionFailed(Precondition::MatchingUid));
-    }
     cal_store
         .put_object(principal, calendar_id, object, overwrite)
         .await?;

crates/caldav/src/calendar_object/prop.rs

@@ -2,7 +2,7 @@ use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_ical::UtcDateTime;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarObjectPropName")]
 pub enum CalendarObjectProp {
     // WebDAV (RFC 2518)
@@ -17,7 +17,7 @@ pub enum CalendarObjectProp {
     CalendarData(String),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarObjectPropWrapperName", untagged)]
 pub enum CalendarObjectPropWrapper {
     CalendarObject(CalendarObjectProp),
@@ -25,7 +25,7 @@ pub enum CalendarObjectPropWrapper {
 }
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq, Hash)]
-pub(crate) struct ExpandElement {
+pub struct ExpandElement {
     #[xml(ty = "attr")]
     pub(crate) start: UtcDateTime,
     #[xml(ty = "attr")]

crates/caldav/src/calendar_object/resource.rs

@@ -1,4 +1,7 @@
-use super::prop::*;
+use super::prop::{
+    CalendarData, CalendarObjectProp, CalendarObjectPropName, CalendarObjectPropWrapper,
+    CalendarObjectPropWrapperName,
+};
 use crate::Error;
 use derive_more::derive::{From, Into};
 use rustical_dav::{

crates/caldav/src/calendar_object/service.rs

@@ -35,7 +35,7 @@ impl<C: CalendarStore> Clone for CalendarObjectResourceService<C> {
 }
 
 impl<C: CalendarStore> CalendarObjectResourceService<C> {
-    pub fn new(cal_store: Arc<C>) -> Self {
+    pub const fn new(cal_store: Arc<C>) -> Self {
         Self { cal_store }
     }
 }
@@ -106,9 +106,8 @@ where
     D: Deserializer<'de>,
 {
     let name: String = Deserialize::deserialize(deserializer)?;
-    if let Some(object_id) = name.strip_suffix(".ics") {
-        Ok(object_id.to_owned())
-    } else {
-        Err(serde::de::Error::custom("Missing .ics extension"))
-    }
+    name.strip_suffix(".ics").map_or_else(
+        || Err(serde::de::Error::custom("Missing .ics extension")),
+        |object_id| Ok(object_id.to_owned()),
+    )
 }

crates/caldav/src/error.rs

@@ -12,8 +12,6 @@ pub enum Precondition {
     #[error("valid-calendar-data")]
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     ValidCalendarData,
-    #[error("matching-uid")]
-    MatchingUid,
 }
 
 impl IntoResponse for Precondition {
@@ -62,23 +60,23 @@ pub enum Error {
 }
 
 impl Error {
+    #[must_use]
     pub fn status_code(&self) -> StatusCode {
         match self {
-            Error::StoreError(err) => match err {
+            Self::StoreError(err) => match err {
                 rustical_store::Error::NotFound => StatusCode::NOT_FOUND,
                 rustical_store::Error::AlreadyExists => StatusCode::CONFLICT,
                 rustical_store::Error::ReadOnly => StatusCode::FORBIDDEN,
                 _ => StatusCode::INTERNAL_SERVER_ERROR,
             },
-            Error::ChronoParseError(_) => StatusCode::INTERNAL_SERVER_ERROR,
-            Error::DavError(err) => StatusCode::try_from(err.status_code().as_u16())
+            Self::DavError(err) => StatusCode::try_from(err.status_code().as_u16())
                 .expect("Just converting between versions"),
-            Error::Unauthorized => StatusCode::UNAUTHORIZED,
-            Error::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
-            Error::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
-            Error::NotFound => StatusCode::NOT_FOUND,
-            Error::IcalError(err) => err.status_code(),
-            Error::PreconditionFailed(_err) => StatusCode::PRECONDITION_FAILED,
+            Self::Unauthorized => StatusCode::UNAUTHORIZED,
+            Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
+            Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::NotFound => StatusCode::NOT_FOUND,
+            Self::IcalError(err) => err.status_code(),
+            Self::PreconditionFailed(_err) => StatusCode::PRECONDITION_FAILED,
         }
     }
 }

crates/caldav/src/lib.rs

@@ -1,3 +1,5 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+#![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 use axum::{Extension, Router};
 use derive_more::Constructor;
 use principal::PrincipalResourceService;
@@ -37,8 +39,8 @@ pub fn caldav_router<AP: AuthenticationProvider, C: CalendarStore, S: Subscripti
         prefix,
         RootResourceService::<_, Principal, CalDavPrincipalUri>::new(PrincipalResourceService {
             auth_provider: auth_provider.clone(),
-            sub_store: subscription_store.clone(),
-            cal_store: store.clone(),
+            sub_store: subscription_store,
+            cal_store: store,
             simplified_home_set,
         })
         .axum_router()

crates/caldav/src/principal/mod.rs

@@ -24,7 +24,7 @@ pub struct PrincipalResource {
 
 impl ResourceName for PrincipalResource {
     fn get_name(&self) -> String {
-        self.principal.id.to_owned()
+        self.principal.id.clone()
     }
 }
 
@@ -56,7 +56,7 @@ impl Resource for PrincipalResource {
             PrincipalPropWrapperName::Principal(prop) => {
                 PrincipalPropWrapper::Principal(match prop {
                     PrincipalPropName::CalendarUserType => {
-                        PrincipalProp::CalendarUserType(self.principal.principal_type.to_owned())
+                        PrincipalProp::CalendarUserType(self.principal.principal_type.clone())
                     }
                     PrincipalPropName::PrincipalUrl => {
                         PrincipalProp::PrincipalUrl(principal_url.into())

crates/caldav/src/principal/prop.rs

@@ -6,7 +6,7 @@ use rustical_store::auth::PrincipalType;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // Scheduling Extensions to CalDAV (RFC 6638)
@@ -34,17 +34,17 @@ pub enum PrincipalProp {
     CalendarHomeSet(CalendarHomeSet),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
 pub struct CalendarHomeSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
 pub enum PrincipalPropWrapper {
     Principal(PrincipalProp),
     Common(CommonPropertiesProp),
 }
 
-#[derive(XmlSerialize, PartialEq, Clone, VariantArray)]
+#[derive(XmlSerialize, PartialEq, Eq, Clone, VariantArray)]
 pub enum ReportMethod {
     // We don't actually support principal-match
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]

crates/carddav/src/address_object/prop.rs

@@ -1,7 +1,7 @@
 use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressObjectPropName")]
 pub enum AddressObjectProp {
     // WebDAV (RFC 2518)
@@ -15,7 +15,7 @@ pub enum AddressObjectProp {
     AddressData(String),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressObjectPropWrapperName", untagged)]
 pub enum AddressObjectPropWrapper {
     AddressObject(AddressObjectProp),

crates/carddav/src/address_object/service.rs

@@ -98,9 +98,8 @@ where
     D: Deserializer<'de>,
 {
     let name: String = Deserialize::deserialize(deserializer)?;
-    if let Some(object_id) = name.strip_suffix(".vcf") {
-        Ok(object_id.to_owned())
-    } else {
-        Err(serde::de::Error::custom("Missing .vcf extension"))
-    }
+    name.strip_suffix(".vcf").map_or_else(
+        || Err(serde::de::Error::custom("Missing .vcf extension")),
+        |object_id| Ok(object_id.to_owned()),
+    )
 }

crates/carddav/src/addressbook/methods/mkcol.rs

@@ -8,7 +8,7 @@ use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Pri
 use rustical_xml::{XmlDeserialize, XmlDocument, XmlRootTag};
 use tracing::instrument;
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 pub struct Resourcetype {
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     addressbook: Option<()>,
@@ -16,7 +16,7 @@ pub struct Resourcetype {
     collection: Option<()>,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 pub struct MkcolAddressbookProp {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     resourcetype: Option<Resourcetype>,
@@ -27,7 +27,7 @@ pub struct MkcolAddressbookProp {
     description: Option<String>,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 pub struct PropElement<T: XmlDeserialize> {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     prop: T,
@@ -53,13 +53,13 @@ pub async fn route_mkcol<AS: AddressbookStore, S: SubscriptionStore>(
     }
 
     let mut request = MkcolRequest::parse_str(&body)?.set.prop;
-    if let Some("") = request.displayname.as_deref() {
-        request.displayname = None
+    if request.displayname.as_deref() == Some("") {
+        request.displayname = None;
     }
 
     let addressbook = Addressbook {
-        id: addressbook_id.to_owned(),
-        principal: principal.to_owned(),
+        id: addressbook_id.clone(),
+        principal: principal.clone(),
         displayname: request.displayname,
         description: request.description,
         deleted_at: None,
@@ -127,6 +127,6 @@ mod tests {
                     }
                 }
             }
-        )
+        );
     }
 }

crates/carddav/src/addressbook/methods/post.rs

@@ -45,12 +45,12 @@ pub async fn route_post<AS: AddressbookStore, S: SubscriptionStore>(
     };
 
     let subscription = Subscription {
-        id: sub_id.to_owned(),
+        id: sub_id.clone(),
         push_resource: request
             .subscription
             .web_push_subscription
             .push_resource
-            .to_owned(),
+            .clone(),
         topic: addressbook_resource.0.push_topic,
         expiration: expires.naive_local(),
         public_key: request

crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs

@@ -13,7 +13,7 @@ use rustical_ical::AddressObject;
 use rustical_store::{AddressbookStore, auth::Principal};
 use rustical_xml::XmlDeserialize;
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[allow(dead_code)]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 pub struct AddressbookMultigetRequest {
@@ -35,7 +35,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
 
     for href in &addressbook_multiget.href {
         if let Some(filename) = href.strip_prefix(path) {
-            let filename = filename.trim_start_matches("/");
+            let filename = filename.trim_start_matches('/');
             if let Some(object_id) = filename.strip_suffix(".vcf") {
                 match store
                     .get_object(principal, addressbook_id, object_id, false)
@@ -44,14 +44,12 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
                     Ok(object) => result.push(object),
                     Err(rustical_store::Error::NotFound) => not_found.push(href.to_owned()),
                     Err(err) => return Err(err.into()),
-                };
+                }
             } else {
                 not_found.push(href.to_owned());
-                continue;
             }
         } else {
             not_found.push(href.to_owned());
-            continue;
         }
     }
 

crates/carddav/src/addressbook/methods/report/mod.rs

@@ -26,10 +26,10 @@ pub(crate) enum ReportRequest {
 }
 
 impl ReportRequest {
-    fn props(&self) -> &PropfindType<AddressObjectPropWrapperName> {
+    const fn props(&self) -> &PropfindType<AddressObjectPropWrapperName> {
         match self {
-            ReportRequest::AddressbookMultiget(AddressbookMultigetRequest { prop, .. }) => prop,
-            ReportRequest::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
+            Self::AddressbookMultiget(AddressbookMultigetRequest { prop, .. })
+            | Self::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
         }
     }
 }
@@ -101,7 +101,7 @@ mod tests {
         assert_eq!(
             report_request,
             ReportRequest::SyncCollection(SyncCollectionRequest {
-                sync_token: "".to_owned(),
+                sync_token: String::new(),
                 sync_level: SyncLevel::One,
                 prop: rustical_dav::xml::PropfindType::Prop(PropElement(
                     vec![AddressObjectPropWrapperName::AddressObject(
@@ -111,7 +111,7 @@ mod tests {
                 )),
                 limit: None
             })
-        )
+        );
     }
 
     #[test]
@@ -142,6 +142,6 @@ mod tests {
                     "/carddav/user/user/6f787542-5256-401a-8db97003260da/ae7a998fdfd1d84a20391168962c62b".to_owned()
                 ]
             })
-        )
+        );
     }
 }

crates/carddav/src/addressbook/prop.rs

@@ -6,7 +6,7 @@ use rustical_dav_push::DavPushExtensionProp;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressbookPropName")]
 pub enum AddressbookProp {
     // CardDAV (RFC 6352)
@@ -20,7 +20,7 @@ pub enum AddressbookProp {
     MaxResourceSize(i64),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressbookPropWrapperName", untagged)]
 pub enum AddressbookPropWrapper {
     Addressbook(AddressbookProp),
@@ -29,7 +29,7 @@ pub enum AddressbookPropWrapper {
     Common(CommonPropertiesProp),
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
 pub struct AddressDataType {
     #[xml(ty = "attr")]
     pub content_type: &'static str,
@@ -37,7 +37,7 @@ pub struct AddressDataType {
     pub version: &'static str,
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
 pub struct SupportedAddressData {
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", flatten)]
     address_data_type: &'static [AddressDataType],
@@ -60,7 +60,7 @@ impl Default for SupportedAddressData {
     }
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq, VariantArray)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq, VariantArray)]
 pub enum ReportMethod {
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     AddressbookMultiget,

crates/carddav/src/addressbook/resource.rs

@@ -17,7 +17,7 @@ pub struct AddressbookResource(pub(crate) Addressbook);
 
 impl ResourceName for AddressbookResource {
     fn get_name(&self) -> String {
-        self.0.id.to_owned()
+        self.0.id.clone()
     }
 }
 
@@ -29,7 +29,7 @@ impl SyncTokenExtension for AddressbookResource {
 
 impl DavPushExtension for AddressbookResource {
     fn get_topic(&self) -> String {
-        self.0.push_topic.to_owned()
+        self.0.push_topic.clone()
     }
 }
 
@@ -59,13 +59,13 @@ impl Resource for AddressbookResource {
             AddressbookPropWrapperName::Addressbook(prop) => {
                 AddressbookPropWrapper::Addressbook(match prop {
                     AddressbookPropName::MaxResourceSize => {
-                        AddressbookProp::MaxResourceSize(10000000)
+                        AddressbookProp::MaxResourceSize(10_000_000)
                     }
                     AddressbookPropName::SupportedReportSet => {
                         AddressbookProp::SupportedReportSet(SupportedReportSet::all())
                     }
                     AddressbookPropName::AddressbookDescription => {
-                        AddressbookProp::AddressbookDescription(self.0.description.to_owned())
+                        AddressbookProp::AddressbookDescription(self.0.description.clone())
                     }
                     AddressbookPropName::SupportedAddressData => {
                         AddressbookProp::SupportedAddressData(SupportedAddressData::default())
@@ -92,9 +92,11 @@ impl Resource for AddressbookResource {
                     self.0.description = description;
                     Ok(())
                 }
-                AddressbookProp::MaxResourceSize(_) => Err(rustical_dav::Error::PropReadOnly),
-                AddressbookProp::SupportedReportSet(_) => Err(rustical_dav::Error::PropReadOnly),
-                AddressbookProp::SupportedAddressData(_) => Err(rustical_dav::Error::PropReadOnly),
+                AddressbookProp::MaxResourceSize(_)
+                | AddressbookProp::SupportedReportSet(_)
+                | AddressbookProp::SupportedAddressData(_) => {
+                    Err(rustical_dav::Error::PropReadOnly)
+                }
             },
             AddressbookPropWrapper::SyncToken(prop) => SyncTokenExtension::set_prop(self, prop),
             AddressbookPropWrapper::DavPush(prop) => DavPushExtension::set_prop(self, prop),
@@ -112,9 +114,11 @@ impl Resource for AddressbookResource {
                     self.0.description = None;
                     Ok(())
                 }
-                AddressbookPropName::MaxResourceSize => Err(rustical_dav::Error::PropReadOnly),
-                AddressbookPropName::SupportedReportSet => Err(rustical_dav::Error::PropReadOnly),
-                AddressbookPropName::SupportedAddressData => Err(rustical_dav::Error::PropReadOnly),
+                AddressbookPropName::MaxResourceSize
+                | AddressbookPropName::SupportedReportSet
+                | AddressbookPropName::SupportedAddressData => {
+                    Err(rustical_dav::Error::PropReadOnly)
+                }
             },
             AddressbookPropWrapperName::SyncToken(prop) => {
                 SyncTokenExtension::remove_prop(self, prop)

crates/carddav/src/addressbook/service.rs

@@ -26,7 +26,7 @@ pub struct AddressbookResourceService<AS: AddressbookStore, S: SubscriptionStore
 }
 
 impl<A: AddressbookStore, S: SubscriptionStore> AddressbookResourceService<A, S> {
-    pub fn new(addr_store: Arc<A>, sub_store: Arc<S>) -> Self {
+    pub const fn new(addr_store: Arc<A>, sub_store: Arc<S>) -> Self {
         Self {
             addr_store,
             sub_store,

crates/carddav/src/error.rs

@@ -30,20 +30,20 @@ pub enum Error {
 }
 
 impl Error {
-    pub fn status_code(&self) -> StatusCode {
+    #[must_use]
+    pub const fn status_code(&self) -> StatusCode {
         match self {
-            Error::StoreError(err) => match err {
+            Self::StoreError(err) => match err {
                 rustical_store::Error::NotFound => StatusCode::NOT_FOUND,
                 rustical_store::Error::AlreadyExists => StatusCode::CONFLICT,
                 rustical_store::Error::ReadOnly => StatusCode::FORBIDDEN,
                 _ => StatusCode::INTERNAL_SERVER_ERROR,
             },
-            Error::ChronoParseError(_) => StatusCode::INTERNAL_SERVER_ERROR,
-            Error::DavError(err) => err.status_code(),
-            Error::Unauthorized => StatusCode::UNAUTHORIZED,
-            Error::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
-            Error::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
-            Error::NotFound => StatusCode::NOT_FOUND,
+            Self::DavError(err) => err.status_code(),
+            Self::Unauthorized => StatusCode::UNAUTHORIZED,
+            Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
+            Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::NotFound => StatusCode::NOT_FOUND,
             Self::IcalError(err) => err.status_code(),
         }
     }

crates/carddav/src/lib.rs

@@ -1,3 +1,5 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+#![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 use axum::response::Redirect;
 use axum::routing::any;
 use axum::{Extension, Router};
@@ -36,20 +38,15 @@ pub fn carddav_router<AP: AuthenticationProvider, A: AddressbookStore, S: Subscr
     store: Arc<A>,
     subscription_store: Arc<S>,
 ) -> Router {
-    let principal_service = PrincipalResourceService::new(
-        store.clone(),
-        auth_provider.clone(),
-        subscription_store.clone(),
-    );
+    let principal_service =
+        PrincipalResourceService::new(store, auth_provider.clone(), subscription_store);
     Router::new()
         .nest(
             prefix,
-            RootResourceService::<_, Principal, CardDavPrincipalUri>::new(
-                principal_service.clone(),
-            )
-            .axum_router()
-            .layer(AuthenticationLayer::new(auth_provider))
-            .layer(Extension(CardDavPrincipalUri(prefix))),
+            RootResourceService::<_, Principal, CardDavPrincipalUri>::new(principal_service)
+                .axum_router()
+                .layer(AuthenticationLayer::new(auth_provider))
+                .layer(Extension(CardDavPrincipalUri(prefix))),
         )
         .route(
             "/.well-known/carddav",

crates/carddav/src/principal/mod.rs

@@ -20,7 +20,7 @@ pub struct PrincipalResource {
 
 impl ResourceName for PrincipalResource {
     fn get_name(&self) -> String {
-        self.principal.id.to_owned()
+        self.principal.id.clone()
     }
 }
 

crates/carddav/src/principal/prop.rs

@@ -4,7 +4,7 @@ use rustical_dav::{
 };
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
@@ -27,10 +27,10 @@ pub enum PrincipalProp {
     PrincipalAddress(Option<HrefElement>),
 }
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
 pub struct AddressbookHomeSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
 pub enum PrincipalPropWrapper {
     Principal(PrincipalProp),

crates/carddav/src/principal/service.rs

@@ -34,7 +34,7 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Clon
 impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore>
     PrincipalResourceService<A, AP, S>
 {
-    pub fn new(addr_store: Arc<A>, auth_provider: Arc<AP>, sub_store: Arc<S>) -> Self {
+    pub const fn new(addr_store: Arc<A>, auth_provider: Arc<AP>, sub_store: Arc<S>) -> Self {
         Self {
             addr_store,
             auth_provider,

crates/dav/Cargo.toml

@@ -11,7 +11,6 @@ publish = false
 axum.workspace = true
 tower.workspace = true
 axum-extra.workspace = true
-
 rustical_xml.workspace = true
 async-trait.workspace = true
 futures-util.workspace = true

crates/dav/src/error.rs

@@ -35,9 +35,9 @@ pub enum Error {
 }
 
 impl Error {
-    pub fn status_code(&self) -> StatusCode {
+    #[must_use]
+    pub const fn status_code(&self) -> StatusCode {
         match self {
-            Self::InternalError => StatusCode::INTERNAL_SERVER_ERROR,
             Self::NotFound => StatusCode::NOT_FOUND,
             Self::BadRequest(_) => StatusCode::BAD_REQUEST,
             Self::Unauthorized => StatusCode::UNAUTHORIZED,
@@ -50,9 +50,9 @@ impl Error {
                 | XmlError::InvalidValue(_) => StatusCode::UNPROCESSABLE_ENTITY,
                 _ => StatusCode::BAD_REQUEST,
             },
-            Error::PropReadOnly => StatusCode::CONFLICT,
-            Error::PreconditionFailed => StatusCode::PRECONDITION_FAILED,
-            Self::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            Self::PropReadOnly => StatusCode::CONFLICT,
+            Self::PreconditionFailed => StatusCode::PRECONDITION_FAILED,
+            Self::InternalError | Self::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR,
             Self::Forbidden => StatusCode::FORBIDDEN,
         }
     }
@@ -68,7 +68,7 @@ impl axum::response::IntoResponse for Error {
         }
 
         let mut resp = axum::response::Response::builder().status(self.status_code());
-        if matches!(&self, &Error::Unauthorized) {
+        if matches!(&self, &Self::Unauthorized) {
             resp.headers_mut()
                 .expect("This must always work")
                 .insert("WWW-Authenticate", "Basic".parse().unwrap());

crates/dav/src/extensions/common.rs

@@ -6,7 +6,7 @@ use crate::{
 };
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, PropName, EnumVariants)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants)]
 #[xml(unit_variants_ident = "CommonPropertiesPropName")]
 pub enum CommonPropertiesProp {
     // WebDAV (RFC 2518)
@@ -39,9 +39,9 @@ pub trait CommonPropertiesExtension: Resource {
             CommonPropertiesPropName::Resourcetype => {
                 CommonPropertiesProp::Resourcetype(self.get_resourcetype())
             }
-            CommonPropertiesPropName::Displayname => {
-                CommonPropertiesProp::Displayname(self.get_displayname().map(|s| s.to_string()))
-            }
+            CommonPropertiesPropName::Displayname => CommonPropertiesProp::Displayname(
+                self.get_displayname().map(std::string::ToString::to_string),
+            ),
             CommonPropertiesPropName::CurrentUserPrincipal => {
                 CommonPropertiesProp::CurrentUserPrincipal(
                     principal_uri.principal_uri(principal.get_id()).into(),

crates/dav/src/extensions/synctoken.rs

@@ -1,6 +1,6 @@
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, PropName, EnumVariants)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants)]
 #[xml(unit_variants_ident = "SyncTokenExtensionPropName")]
 pub enum SyncTokenExtensionProp {
     // Collection Synchronization (RFC 6578)

crates/dav/src/header/depth.rs

@@ -19,7 +19,7 @@ impl IntoResponse for InvalidDepthHeader {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Depth {
     Zero,
     One,
@@ -29,9 +29,9 @@ pub enum Depth {
 impl ValueSerialize for Depth {
     fn serialize(&self) -> String {
         match self {
-            Depth::Zero => "0",
-            Depth::One => "1",
-            Depth::Infinity => "infinity",
+            Self::Zero => "0",
+            Self::One => "1",
+            Self::Infinity => "infinity",
         }
         .to_owned()
     }
@@ -55,9 +55,9 @@ impl TryFrom<&[u8]> for Depth {
 
     fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
         match value {
-            b"0" => Ok(Depth::Zero),
-            b"1" => Ok(Depth::One),
-            b"Infinity" | b"infinity" => Ok(Depth::Infinity),
+            b"0" => Ok(Self::Zero),
+            b"1" => Ok(Self::One),
+            b"Infinity" | b"infinity" => Ok(Self::Infinity),
             _ => Err(InvalidDepthHeader),
         }
     }
@@ -85,10 +85,11 @@ impl<S: Send + Sync> FromRequestParts<S> for Depth {
         parts: &mut axum::http::request::Parts,
         _state: &S,
     ) -> Result<Self, Self::Rejection> {
-        if let Some(depth_header) = parts.headers.get("Depth") {
-            depth_header.as_bytes().try_into()
-        } else {
-            Ok(Self::Zero)
-        }
+        parts
+            .headers
+            .get("Depth")
+            .map_or(Ok(Self::Zero), |depth_header| {
+                depth_header.as_bytes().try_into()
+            })
     }
 }

crates/dav/src/header/overwrite.rs

@@ -14,7 +14,7 @@ impl IntoResponse for InvalidOverwriteHeader {
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct Overwrite(pub bool);
 
 impl Default for Overwrite {
@@ -30,11 +30,10 @@ impl<S: Send + Sync> FromRequestParts<S> for Overwrite {
         parts: &mut axum::http::request::Parts,
         _state: &S,
     ) -> Result<Self, Self::Rejection> {
-        if let Some(overwrite_header) = parts.headers.get("Overwrite") {
-            overwrite_header.as_bytes().try_into()
-        } else {
-            Ok(Self::default())
-        }
+        parts.headers.get("Overwrite").map_or_else(
+            || Ok(Self::default()),
+            |overwrite_header| overwrite_header.as_bytes().try_into(),
+        )
     }
 }
 
@@ -60,7 +59,7 @@ mod tests {
     #[tokio::test]
     async fn test_overwrite_default() {
         let request = Request::put("asd").body(()).unwrap();
-        let (mut parts, _) = request.into_parts();
+        let (mut parts, ()) = request.into_parts();
         let overwrite = Overwrite::from_request_parts(&mut parts, &())
             .await
             .unwrap();

crates/dav/src/lib.rs

@@ -1,3 +1,5 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+#![allow(clippy::missing_errors_doc)]
 pub mod error;
 pub mod extensions;
 pub mod header;

crates/dav/src/privileges.rs

@@ -41,12 +41,13 @@ impl XmlSerialize for UserPrivilegeSet {
     }
 }
 
-#[derive(Debug, Clone, Default, PartialEq)]
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
 pub struct UserPrivilegeSet {
     privileges: HashSet<UserPrivilege>,
 }
 
 impl UserPrivilegeSet {
+    #[must_use]
     pub fn has(&self, privilege: &UserPrivilege) -> bool {
         if (privilege == &UserPrivilege::WriteProperties
             || privilege == &UserPrivilege::WriteContent)
@@ -57,12 +58,14 @@ impl UserPrivilegeSet {
         self.privileges.contains(privilege) || self.privileges.contains(&UserPrivilege::All)
     }
 
+    #[must_use]
     pub fn all() -> Self {
         Self {
             privileges: HashSet::from([UserPrivilege::All]),
         }
     }
 
+    #[must_use]
     pub fn owner_only(is_owner: bool) -> Self {
         if is_owner {
             Self::all()
@@ -71,6 +74,7 @@ impl UserPrivilegeSet {
         }
     }
 
+    #[must_use]
     pub fn owner_read(is_owner: bool) -> Self {
         if is_owner {
             Self::read_only()
@@ -79,6 +83,7 @@ impl UserPrivilegeSet {
         }
     }
 
+    #[must_use]
     pub fn owner_write_properties(is_owner: bool) -> Self {
         // Content is read-only but we can write properties
         if is_owner {
@@ -88,6 +93,7 @@ impl UserPrivilegeSet {
         }
     }
 
+    #[must_use]
     pub fn read_only() -> Self {
         Self {
             privileges: HashSet::from([
@@ -98,6 +104,7 @@ impl UserPrivilegeSet {
         }
     }
 
+    #[must_use]
     pub fn write_properties() -> Self {
         Self {
             privileges: HashSet::from([

crates/dav/src/resource/axum_methods.rs

@@ -9,41 +9,49 @@ pub type MethodFunction<State> =
 
 pub trait AxumMethods: Sized + Send + Sync + 'static {
     #[inline]
+    #[must_use]
     fn report() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn get() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn post() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn mkcol() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn mkcalendar() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn put() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn import() -> Option<MethodFunction<Self>> {
         None
     }
 
     #[inline]
+    #[must_use]
     fn allow_header() -> Allow {
         let mut allow = vec![
             Method::from_str("PROPFIND").unwrap(),

crates/dav/src/resource/axum_service.rs

@@ -23,7 +23,7 @@ pub struct AxumService<RS: ResourceService + AxumMethods> {
 }
 
 impl<RS: ResourceService + AxumMethods> AxumService<RS> {
-    pub fn new(resource_service: RS) -> Self {
+    pub const fn new(resource_service: RS) -> Self {
         Self { resource_service }
     }
 }
@@ -103,7 +103,7 @@ where
                 }
             }
             _ => {}
-        };
+        }
         Box::pin(async move {
             Ok(Response::builder()
                 .status(StatusCode::METHOD_NOT_ALLOWED)

crates/dav/src/resource/methods/copy.rs

@@ -12,7 +12,7 @@ use serde::Deserialize;
 use tracing::instrument;
 
 #[instrument(skip(path, resource_service,))]
-pub(crate) async fn axum_route_copy<R: ResourceService>(
+pub async fn axum_route_copy<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
     depth: Option<Depth>,

crates/dav/src/resource/methods/delete.rs

@@ -7,7 +7,7 @@ use axum_extra::TypedHeader;
 use headers::{IfMatch, IfNoneMatch};
 use http::HeaderMap;
 
-pub(crate) async fn axum_route_delete<R: ResourceService>(
+pub async fn axum_route_delete<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
     principal: R::Principal,
@@ -24,8 +24,7 @@ pub(crate) async fn axum_route_delete<R: ResourceService>(
     }
     let no_trash = header_map
         .get("X-No-Trashbin")
-        .map(|val| matches!(val.to_str(), Ok("1")))
-        .unwrap_or(false);
+        .is_some_and(|val| matches!(val.to_str(), Ok("1")));
     route_delete(
         &path,
         &principal,

crates/dav/src/resource/methods/mod.rs

@@ -4,8 +4,8 @@ mod mv;
 mod propfind;
 mod proppatch;
 
-pub(crate) use copy::axum_route_copy;
-pub(crate) use delete::axum_route_delete;
-pub(crate) use mv::axum_route_move;
-pub(crate) use propfind::axum_route_propfind;
-pub(crate) use proppatch::axum_route_proppatch;
+pub use copy::axum_route_copy;
+pub use delete::axum_route_delete;
+pub use mv::axum_route_move;
+pub use propfind::axum_route_propfind;
+pub use proppatch::axum_route_proppatch;

crates/dav/src/resource/methods/mv.rs

@@ -12,7 +12,7 @@ use serde::Deserialize;
 use tracing::instrument;
 
 #[instrument(skip(path, resource_service,))]
-pub(crate) async fn axum_route_move<R: ResourceService>(
+pub async fn axum_route_move<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
     depth: Option<Depth>,

crates/dav/src/resource/methods/propfind.rs

@@ -15,7 +15,7 @@ type RSMultistatus<R> = MultistatusElement<
 >;
 
 #[instrument(skip(path, resource_service, puri))]
-pub(crate) async fn axum_route_propfind<R: ResourceService>(
+pub async fn axum_route_propfind<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
     depth: Depth,
@@ -36,7 +36,7 @@ pub(crate) async fn axum_route_propfind<R: ResourceService>(
     .await
 }
 
-pub(crate) async fn route_propfind<R: ResourceService>(
+pub async fn route_propfind<R: ResourceService>(
     path_components: &R::PathComponents,
     path: &str,
     body: &str,

crates/dav/src/resource/methods/proppatch.rs

@@ -61,7 +61,7 @@ enum Operation<T: XmlDeserialize> {
 #[xml(ns = "crate::namespace::NS_DAV")]
 struct PropertyupdateElement<T: XmlDeserialize>(#[xml(ty = "untagged", flatten)] Vec<Operation<T>>);
 
-pub(crate) async fn axum_route_proppatch<R: ResourceService>(
+pub async fn axum_route_proppatch<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
     State(resource_service): State<R>,
     principal: R::Principal,
@@ -71,7 +71,7 @@ pub(crate) async fn axum_route_proppatch<R: ResourceService>(
     route_proppatch(&path, uri.path(), &body, &principal, &resource_service).await
 }
 
-pub(crate) async fn route_proppatch<R: ResourceService>(
+pub async fn route_proppatch<R: ResourceService>(
     path_components: &R::PathComponents,
     path: &str,
     body: &str,
@@ -96,7 +96,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
     let mut props_conflict = Vec::new();
     let mut props_not_found = Vec::new();
 
-    for operation in operations.into_iter() {
+    for operation in operations {
         match operation {
             Operation::Set(SetPropertyElement {
                 prop: SetPropertyPropWrapperWrapper(properties),
@@ -113,7 +113,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
                                 Err(Error::PropReadOnly) => props_conflict
                                     .push((ns.map(NamespaceOwned::from), propname.to_owned())),
                                 Err(err) => return Err(err.into()),
-                            };
+                            }
                         }
                         SetPropertyPropWrapper::Invalid(invalid) => {
                             let propname = invalid.tag_name();
@@ -131,7 +131,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
                                 // This happens in following cases:
                                 // - read-only properties with #[serde(skip_deserializing)]
                                 // - internal properties
-                                props_conflict.push(full_propname)
+                                props_conflict.push(full_propname);
                             } else {
                                 props_not_found.push((None, propname));
                             }
@@ -154,7 +154,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
                         },
                         // I guess removing a nonexisting property should be successful :)
                         Err(_) => props_ok.push((None, propname)),
-                    };
+                    }
                 }
             }
         }

crates/dav/src/resource/mod.rs

@@ -42,6 +42,7 @@ pub trait Resource: Clone + Send + 'static {
 
     fn get_resourcetype(&self) -> Resourcetype;
 
+    #[must_use]
     fn list_props() -> Vec<(Option<Namespace<'static>>, &'static str)> {
         Self::Prop::variant_names()
     }
@@ -75,27 +76,27 @@ pub trait Resource: Clone + Send + 'static {
     }
 
     fn satisfies_if_match(&self, if_match: &IfMatch) -> bool {
-        if let Some(etag) = self.get_etag() {
-            if let Ok(etag) = ETag::from_str(&etag) {
-                if_match.precondition_passes(&etag)
-            } else {
-                if_match.is_any()
-            }
-        } else {
-            if_match.is_any()
-        }
+        self.get_etag().map_or_else(
+            || if_match.is_any(),
+            |etag| {
+                ETag::from_str(&etag).map_or_else(
+                    |_| if_match.is_any(),
+                    |etag| if_match.precondition_passes(&etag),
+                )
+            },
+        )
     }
 
     fn satisfies_if_none_match(&self, if_none_match: &IfNoneMatch) -> bool {
-        if let Some(etag) = self.get_etag() {
-            if let Ok(etag) = ETag::from_str(&etag) {
-                if_none_match.precondition_passes(&etag)
-            } else {
-                if_none_match != &IfNoneMatch::any()
-            }
-        } else {
-            if_none_match != &IfNoneMatch::any()
-        }
+        self.get_etag().map_or_else(
+            || if_none_match != &IfNoneMatch::any(),
+            |etag| {
+                ETag::from_str(&etag).map_or_else(
+                    |_| if_none_match != &IfNoneMatch::any(),
+                    |etag| if_none_match.precondition_passes(&etag),
+                )
+            },
+        )
     }
 
     fn get_user_privileges(
@@ -106,13 +107,13 @@ pub trait Resource: Clone + Send + 'static {
     fn parse_propfind(
         body: &str,
     ) -> Result<PropfindElement<<Self::Prop as PropName>::Names>, rustical_xml::XmlError> {
-        if !body.is_empty() {
-            PropfindElement::parse_str(body)
-        } else {
+        if body.is_empty() {
             Ok(PropfindElement {
                 prop: PropfindType::Allprop,
                 include: None,
             })
+        } else {
+            PropfindElement::parse_str(body)
         }
     }
 
@@ -139,7 +140,7 @@ pub trait Resource: Clone + Send + 'static {
                         .collect_vec();
 
                     return Ok(ResponseElement {
-                        href: path.to_owned(),
+                        href: path.clone(),
                         propstat: vec![PropstatWrapper::TagList(PropstatElement {
                             prop: TagList::from(props),
                             status: StatusCode::OK,
@@ -181,7 +182,7 @@ pub trait Resource: Clone + Send + 'static {
             }));
         }
         Ok(ResponseElement {
-            href: path.to_owned(),
+            href: path.clone(),
             propstat: propstats,
             ..Default::default()
         })

crates/dav/src/resource/resource_service.rs

@@ -76,10 +76,7 @@ pub trait ResourceService: Clone + Sized + Send + Sync + AxumMethods + 'static {
         Err(crate::Error::Forbidden.into())
     }
 
-    fn axum_service(self) -> AxumService<Self>
-    where
-        Self: AxumMethods,
-    {
+    fn axum_service(self) -> AxumService<Self> {
         AxumService::new(self)
     }
 

crates/dav/src/resources/root.rs

@@ -63,7 +63,7 @@ pub struct RootResourceService<PRS: ResourceService + Clone, P: Principal, PURI:
 impl<PRS: ResourceService + Clone, P: Principal, PURI: PrincipalUri>
     RootResourceService<PRS, P, PURI>
 {
-    pub fn new(principal_resource_service: PRS) -> Self {
+    pub const fn new(principal_resource_service: PRS) -> Self {
         Self(principal_resource_service, PhantomData, PhantomData)
     }
 }
@@ -88,7 +88,7 @@ where
 
     async fn get_resource(
         &self,
-        _: &(),
+        (): &(),
         _show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error> {
         Ok(RootResource::<PRS::Resource, P>::default())

crates/dav/src/xml/group.rs

@@ -1,8 +1,8 @@
 use crate::xml::HrefElement;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
 pub struct GroupMembership(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
 pub struct GroupMemberSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);

crates/dav/src/xml/href.rs

@@ -1,14 +1,15 @@
 use derive_more::From;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, Debug, Clone, From, PartialEq)]
+#[derive(XmlDeserialize, XmlSerialize, Debug, Clone, From, PartialEq, Eq)]
 pub struct HrefElement {
     #[xml(ns = "crate::namespace::NS_DAV")]
     pub href: String,
 }
 
 impl HrefElement {
-    pub fn new(href: String) -> Self {
+    #[must_use]
+    pub const fn new(href: String) -> Self {
         Self { href }
     }
 }

crates/dav/src/xml/multistatus.rs

@@ -19,6 +19,7 @@ pub struct PropstatElement<PropType: XmlSerialize> {
     pub status: StatusCode,
 }
 
+#[allow(clippy::trivially_copy_pass_by_ref)]
 fn xml_serialize_status(
     status: &StatusCode,
     ns: Option<Namespace>,
@@ -26,7 +27,7 @@ fn xml_serialize_status(
     namespaces: &HashMap<Namespace, &str>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
-    XmlSerialize::serialize(&format!("HTTP/1.1 {}", status), ns, tag, namespaces, writer)
+    XmlSerialize::serialize(&format!("HTTP/1.1 {status}"), ns, tag, namespaces, writer)
 }
 
 #[derive(XmlSerialize)]
@@ -56,6 +57,7 @@ pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub propstat: Vec<PropstatWrapper<PropstatType>>,
 }
 
+#[allow(clippy::trivially_copy_pass_by_ref, clippy::ref_option)]
 fn xml_serialize_optional_status(
     val: &Option<StatusCode>,
     ns: Option<Namespace>,
@@ -64,7 +66,7 @@ fn xml_serialize_optional_status(
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(
-        &val.map(|status| format!("HTTP/1.1 {}", status)),
+        &val.map(|status| format!("HTTP/1.1 {status}")),
         ns,
         tag,
         namespaces,

crates/dav/src/xml/propfind.rs

@@ -6,7 +6,7 @@ use rustical_xml::XmlDeserialize;
 use rustical_xml::XmlError;
 use rustical_xml::XmlRootTag;
 
-#[derive(Debug, Clone, XmlDeserialize, XmlRootTag, PartialEq)]
+#[derive(Debug, Clone, XmlDeserialize, XmlRootTag, PartialEq, Eq)]
 #[xml(root = "propfind", ns = "crate::namespace::NS_DAV")]
 pub struct PropfindElement<PN: XmlDeserialize> {
     #[xml(ty = "untagged")]
@@ -15,7 +15,7 @@ pub struct PropfindElement<PN: XmlDeserialize> {
     pub include: Option<PropElement<PN>>,
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PropElement<PN: XmlDeserialize>(
     // valid
     pub Vec<PN>,
@@ -82,7 +82,7 @@ impl<PN: XmlDeserialize> XmlDeserialize for PropElement<PN> {
     }
 }
 
-#[derive(Debug, Clone, XmlDeserialize, PartialEq)]
+#[derive(Debug, Clone, XmlDeserialize, PartialEq, Eq)]
 pub enum PropfindType<PN: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
     Propname,

crates/dav/src/xml/report_set.rs

@@ -2,7 +2,7 @@ use rustical_xml::XmlSerialize;
 use strum::VariantArray;
 
 // RFC 3253 section-3.1.5
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
 pub struct SupportedReportSet<T: XmlSerialize + 'static> {
     #[xml(flatten)]
     #[xml(ns = "crate::namespace::NS_DAV")]
@@ -10,6 +10,7 @@ pub struct SupportedReportSet<T: XmlSerialize + 'static> {
 }
 
 impl<T: XmlSerialize + Clone + 'static> SupportedReportSet<T> {
+    #[must_use]
     pub fn new(methods: Vec<T>) -> Self {
         Self {
             supported_report: methods
@@ -27,7 +28,7 @@ impl<T: XmlSerialize + Clone + 'static> SupportedReportSet<T> {
     }
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
 pub struct ReportWrapper<T: XmlSerialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
     report: T,

crates/dav/src/xml/resourcetype.rs

@@ -1,9 +1,9 @@
 use rustical_xml::XmlSerialize;
 
-#[derive(Debug, Clone, PartialEq, XmlSerialize)]
+#[derive(Debug, Clone, PartialEq, Eq, XmlSerialize)]
 pub struct Resourcetype(#[xml(flatten, ty = "untagged")] pub &'static [ResourcetypeInner]);
 
-#[derive(Debug, Clone, PartialEq, XmlSerialize)]
+#[derive(Debug, Clone, PartialEq, Eq, XmlSerialize)]
 pub struct ResourcetypeInner(
     #[xml(ty = "namespace")] pub Option<quick_xml::name::Namespace<'static>>,
     #[xml(ty = "tag_name")] pub &'static str,
@@ -40,6 +40,6 @@ mod tests {
         <calendar-color xmlns="http://calendarserver.org/ns/"/>
     </resourcetype>
 </document>"#
-        )
+        );
     }
 }

crates/dav/src/xml/sync_collection.rs

@@ -2,7 +2,7 @@ use rustical_xml::{ValueDeserialize, ValueSerialize, XmlDeserialize, XmlRootTag}
 
 use super::PropfindType;
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum SyncLevel {
     One,
     Infinity,
@@ -25,15 +25,15 @@ impl ValueDeserialize for SyncLevel {
 impl ValueSerialize for SyncLevel {
     fn serialize(&self) -> String {
         match self {
-            SyncLevel::One => "1",
-            SyncLevel::Infinity => "Infinity",
+            Self::One => "1",
+            Self::Infinity => "Infinity",
         }
         .to_owned()
     }
 }
 
 // https://datatracker.ietf.org/doc/html/rfc5323#section-5.17
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 pub struct LimitElement {
     #[xml(ns = "crate::namespace::NS_DAV")]
     pub nresults: NresultsElement,
@@ -53,10 +53,10 @@ impl From<LimitElement> for u64 {
     }
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 pub struct NresultsElement(#[xml(ty = "text")] u64);
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq, XmlRootTag)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq, XmlRootTag)]
 // <!ELEMENT sync-collection (sync-token, sync-level, limit?, prop)>
 //    <!-- DAV:limit defined in RFC 5323, Section 5.17 -->
 //    <!-- DAV:prop defined in RFC 4918, Section 14.18 -->
@@ -106,11 +106,11 @@ mod tests {
         assert_eq!(
             request,
             SyncCollectionRequest {
-                sync_token: "".to_owned(),
+                sync_token: String::new(),
                 sync_level: SyncLevel::One,
                 prop: PropfindType::Prop(PropElement(vec![TestPropName::Getetag], vec![])),
                 limit: Some(100.into())
             }
-        )
+        );
     }
 }

crates/dav/src/xml/tag_list.rs

@@ -6,7 +6,7 @@ use quick_xml::{
 use rustical_xml::{NamespaceOwned, XmlSerialize};
 use std::collections::HashMap;
 
-#[derive(Clone, Debug, PartialEq, From)]
+#[derive(Clone, Debug, PartialEq, Eq, From)]
 pub struct TagList(Vec<(Option<NamespaceOwned>, String)>);
 
 impl XmlSerialize for TagList {
@@ -17,16 +17,13 @@ impl XmlSerialize for TagList {
         namespaces: &HashMap<Namespace, &str>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
-        let prefix = ns
-            .map(|ns| namespaces.get(&ns))
-            .unwrap_or(None)
-            .map(|prefix| {
-                if !prefix.is_empty() {
-                    format!("{prefix}:")
-                } else {
-                    String::new()
-                }
-            });
+        let prefix = ns.and_then(|ns| namespaces.get(&ns)).map(|prefix| {
+            if prefix.is_empty() {
+                String::new()
+            } else {
+                format!("{prefix}:")
+            }
+        });
         let has_prefix = prefix.is_some();
         let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
 

crates/dav_push/src/extension.rs

@@ -2,7 +2,7 @@ use crate::{ContentUpdate, PropertyUpdate, SupportedTriggers, Transports, Trigge
 use rustical_dav::header::Depth;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, PropName, EnumVariants)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants)]
 #[xml(unit_variants_ident = "DavPushExtensionPropName")]
 pub enum DavPushExtensionProp {
     // WebDav Push
@@ -32,7 +32,7 @@ pub trait DavPushExtension {
     ) -> Result<DavPushExtensionProp, rustical_dav::Error> {
         Ok(match &prop {
             DavPushExtensionPropName::Transports => {
-                DavPushExtensionProp::Transports(Default::default())
+                DavPushExtensionProp::Transports(Transports::default())
             }
             DavPushExtensionPropName::Topic => DavPushExtensionProp::Topic(self.get_topic()),
             DavPushExtensionPropName::SupportedTriggers => {

crates/dav_push/src/lib.rs

@@ -1,3 +1,5 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+#![allow(clippy::missing_errors_doc)]
 mod extension;
 mod prop;
 pub mod register;
@@ -57,7 +59,7 @@ impl<S: SubscriptionStore> DavPushController<S> {
             let mut latest_messages = HashMap::new();
             for message in messages {
                 if matches!(message.data, CollectionOperationInfo::Content { .. }) {
-                    latest_messages.insert(message.topic.to_string(), message);
+                    latest_messages.insert(message.topic.clone(), message);
                 }
             }
             let messages = latest_messages.into_values();
@@ -68,6 +70,7 @@ impl<S: SubscriptionStore> DavPushController<S> {
         }
     }
 
+    #[allow(clippy::cognitive_complexity)]
     async fn send_message(&self, message: CollectionOperation) {
         let subscriptions = match self.sub_store.get_subscriptions(&message.topic).await {
             Ok(subs) => subs,
@@ -124,7 +127,7 @@ impl<S: SubscriptionStore> DavPushController<S> {
                         subsciption.id, subsciption.topic
                     );
                     self.try_delete_subscription(&subsciption.id).await;
-                };
+                }
             }
 
             if let Err(err) = self.send_payload(&payload, &subsciption).await {
@@ -153,12 +156,13 @@ impl<S: SubscriptionStore> DavPushController<S> {
     ) -> Result<(), NotifierError> {
         if subsciption.public_key_type != "p256dh" {
             return Err(NotifierError::InvalidPublicKeyType(
-                subsciption.public_key_type.to_string(),
+                subsciption.public_key_type.clone(),
             ));
         }
-        let endpoint = subsciption.push_resource.parse().map_err(|_| {
-            NotifierError::InvalidEndpointUrl(subsciption.push_resource.to_string())
-        })?;
+        let endpoint = subsciption
+            .push_resource
+            .parse()
+            .map_err(|_| NotifierError::InvalidEndpointUrl(subsciption.push_resource.clone()))?;
         let ua_public = base64::engine::general_purpose::URL_SAFE_NO_PAD
             .decode(&subsciption.public_key)
             .map_err(|_| NotifierError::InvalidKeyEncoding)?;
@@ -206,7 +210,7 @@ enum NotifierError {
 
 impl NotifierError {
     // Decide whether the error should cause the subscription to be removed
-    pub fn is_permament_error(&self) -> bool {
+    pub const fn is_permament_error(&self) -> bool {
         match self {
             Self::InvalidPublicKeyType(_)
             | Self::InvalidEndpointUrl(_)

crates/dav_push/src/prop.rs

@@ -1,13 +1,13 @@
 use rustical_dav::header::Depth;
 use rustical_xml::{Unparsed, XmlDeserialize, XmlSerialize};
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
 pub enum Transport {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
     WebPush,
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
 pub struct Transports {
     #[xml(flatten, ty = "untagged")]
     #[xml(ns = "crate::namespace::NS_DAVPUSH")]
@@ -22,10 +22,10 @@ impl Default for Transports {
     }
 }
 
-#[derive(XmlSerialize, XmlDeserialize, PartialEq, Clone)]
+#[derive(XmlSerialize, XmlDeserialize, PartialEq, Eq, Clone)]
 pub struct SupportedTriggers(#[xml(flatten, ty = "untagged")] pub Vec<Trigger>);
 
-#[derive(XmlSerialize, XmlDeserialize, PartialEq, Debug, Clone)]
+#[derive(XmlSerialize, XmlDeserialize, PartialEq, Eq, Debug, Clone)]
 pub enum Trigger {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
     ContentUpdate(ContentUpdate),
@@ -33,12 +33,12 @@ pub enum Trigger {
     PropertyUpdate(PropertyUpdate),
 }
 
-#[derive(XmlSerialize, XmlDeserialize, PartialEq, Clone, Debug)]
+#[derive(XmlSerialize, XmlDeserialize, PartialEq, Eq, Clone, Debug)]
 pub struct ContentUpdate(
     #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
-#[derive(XmlSerialize, PartialEq, Clone, Debug)]
+#[derive(XmlSerialize, PartialEq, Eq, Clone, Debug)]
 pub struct PropertyUpdate(
     #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );

crates/dav_push/src/register.rs

@@ -1,7 +1,7 @@
 use crate::Trigger;
 use rustical_xml::{XmlDeserialize, XmlRootTag, XmlSerialize};
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 #[xml(ns = "crate::namespace::NS_DAVPUSH")]
 pub struct WebPushSubscription {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
@@ -15,7 +15,7 @@ pub struct WebPushSubscription {
     pub auth_secret: String,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 pub struct SubscriptionPublicKey {
     #[xml(ty = "attr", rename = "type")]
     pub ty: String,
@@ -23,16 +23,16 @@ pub struct SubscriptionPublicKey {
     pub key: String,
 }
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
 pub struct SubscriptionElement {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
     pub web_push_subscription: WebPushSubscription,
 }
 
-#[derive(XmlDeserialize, XmlSerialize, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, XmlSerialize, Clone, Debug, PartialEq, Eq)]
 pub struct TriggerElement(#[xml(ty = "untagged", flatten)] Vec<Trigger>);
 
-#[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
+#[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq, Eq)]
 #[xml(root = "push-register")]
 #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
 pub struct PushRegister {
@@ -100,6 +100,6 @@ mod tests {
                     Trigger::PropertyUpdate(PropertyUpdate(Depth::Zero)),
                 ]))
             }
-        )
+        );
     }
 }

crates/frontend/src/assets.rs

@@ -8,7 +8,7 @@ use futures_core::future::BoxFuture;
 use headers::{ContentType, ETag, HeaderMapExt};
 use http::{Method, StatusCode};
 use rust_embed::RustEmbed;
-use std::{convert::Infallible, marker::PhantomData, str::FromStr};
+use std::{borrow::Cow, convert::Infallible, marker::PhantomData, str::FromStr};
 use tower::Service;
 
 #[derive(Clone, RustEmbed, Default)]
@@ -16,6 +16,7 @@ use tower::Service;
 #[allow(dead_code)] // Since this is not used with the frontend-dev feature
 pub struct Assets;
 
+#[allow(dead_code)]
 #[derive(Clone, Default)]
 pub struct EmbedService<E>
 where
@@ -41,6 +42,7 @@ where
     }
 
     #[inline]
+    #[allow(clippy::similar_names)]
     fn call(&mut self, mut req: Request) -> Self::Future {
         Box::pin(async move {
             if req.method() != Method::GET && req.method() != Method::HEAD {
@@ -60,7 +62,7 @@ where
                     let mime = mime_guess::from_path(path).first_or_octet_stream();
 
                     let body = if req.method() == Method::HEAD {
-                        Default::default()
+                        Cow::default()
                     } else {
                         data
                     };

crates/frontend/src/config.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-fn default_true() -> bool {
+const fn default_true() -> bool {
     true
 }
 

crates/frontend/src/lib.rs

@@ -1,3 +1,4 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
 use axum::{
     Extension, RequestExt, Router,
     body::Body,
@@ -47,7 +48,7 @@ pub fn frontend_router<AP: AuthenticationProvider, CS: CalendarStore, AS: Addres
 ) -> Router {
     let user_router = Router::new()
         .route("/", get(route_get_home))
-        .route("/{user}", get(route_user_named::<CS, AS, AP>))
+        .route("/{user}", get(route_user_named::<AP>))
         // App token management
         .route("/{user}/app_token", post(route_post_app_token::<AP>))
         .route(
@@ -105,11 +106,11 @@ pub fn frontend_router<AP: AuthenticationProvider, CS: CalendarStore, AS: Addres
 
     router = router
         .layer(AuthenticationLayer::new(auth_provider.clone()))
-        .layer(Extension(auth_provider.clone()))
-        .layer(Extension(cal_store.clone()))
-        .layer(Extension(addr_store.clone()))
-        .layer(Extension(frontend_config.clone()))
-        .layer(Extension(oidc_config.clone()));
+        .layer(Extension(auth_provider))
+        .layer(Extension(cal_store))
+        .layer(Extension(addr_store))
+        .layer(Extension(frontend_config))
+        .layer(Extension(oidc_config));
 
     Router::new()
         .nest(prefix, router)

crates/frontend/src/nextcloud_login/mod.rs

@@ -58,6 +58,6 @@ pub fn nextcloud_login_router<AP: AuthenticationProvider>(auth_provider: Arc<AP>
         .route("/", post(post_nextcloud_login))
         .layer(Extension(nextcloud_flows))
         .layer(Extension(auth_provider.clone()))
-        .layer(AuthenticationLayer::new(auth_provider.clone()))
+        .layer(AuthenticationLayer::new(auth_provider))
         .layer(middleware::from_fn(unauthorized_handler))
 }

crates/frontend/src/nextcloud_login/routes.rs

@@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use tracing::instrument;
 
-pub(crate) async fn post_nextcloud_login(
+pub async fn post_nextcloud_login(
     Extension(state): Extension<Arc<NextcloudFlows>>,
     TypedHeader(user_agent): TypedHeader<UserAgent>,
     Host(host): Host,
@@ -27,20 +27,22 @@ pub(crate) async fn post_nextcloud_login(
     let token = uuid::Uuid::new_v4().to_string();
 
     let app_name = user_agent.to_string();
-    let mut flows = state.flows.write().await;
-    // Flows must not last longer than 10 minutes
-    // We also enforce that condition here to prevent a memory leak where unpolled flows would
-    // never be cleaned up
-    flows.retain(|_, flow| Utc::now() - flow.created_at < Duration::minutes(10));
-    flows.insert(
-        flow_id.clone(),
-        NextcloudFlow {
-            app_name: app_name.to_owned(),
-            created_at: Utc::now(),
-            token: token.to_owned(),
-            response: None,
-        },
-    );
+    {
+        let mut flows = state.flows.write().await;
+        // Flows must not last longer than 10 minutes
+        // We also enforce that condition here to prevent a memory leak where unpolled flows would
+        // never be cleaned up
+        flows.retain(|_, flow| Utc::now() - flow.created_at < Duration::minutes(10));
+        flows.insert(
+            flow_id.clone(),
+            NextcloudFlow {
+                app_name: app_name.clone(),
+                created_at: Utc::now(),
+                token: token.clone(),
+                response: None,
+            },
+        );
+    }
     Json(NextcloudLoginResponse {
         login: format!("https://{host}/index.php/login/v2/flow/{flow_id}"),
         poll: NextcloudLoginPoll {
@@ -52,11 +54,12 @@ pub(crate) async fn post_nextcloud_login(
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct NextcloudPollForm {
+pub struct NextcloudPollForm {
     token: String,
 }
 
-pub(crate) async fn post_nextcloud_poll<AP: AuthenticationProvider>(
+#[allow(clippy::significant_drop_tightening)]
+pub async fn post_nextcloud_poll<AP: AuthenticationProvider>(
     Extension(state): Extension<Arc<NextcloudFlows>>,
     Path(flow_id): Path<String>,
     Extension(auth_provider): Extension<Arc<AP>>,
@@ -75,8 +78,8 @@ pub(crate) async fn post_nextcloud_poll<AP: AuthenticationProvider>(
             auth_provider
                 .add_app_token(
                     &response.login_name,
-                    flow.app_name.to_owned(),
-                    response.app_password.to_owned(),
+                    flow.app_name.clone(),
+                    response.app_password.clone(),
                 )
                 .await?;
             flows.remove(&flow_id);
@@ -98,7 +101,7 @@ struct NextcloudLoginPage {
 }
 
 #[instrument(skip(state))]
-pub(crate) async fn get_nextcloud_flow(
+pub async fn get_nextcloud_flow(
     Extension(state): Extension<Arc<NextcloudFlows>>,
     Path(flow_id): Path<String>,
     user: Principal,
@@ -107,7 +110,7 @@ pub(crate) async fn get_nextcloud_flow(
         Ok(Html(
             NextcloudLoginPage {
                 username: user.displayname.unwrap_or(user.id),
-                app_name: flow.app_name.to_owned(),
+                app_name: flow.app_name.clone(),
             }
             .render()
             .unwrap(),
@@ -119,7 +122,7 @@ pub(crate) async fn get_nextcloud_flow(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
-pub(crate) struct NextcloudAuthorizeForm {
+pub struct NextcloudAuthorizeForm {
     app_name: String,
 }
 
@@ -130,7 +133,7 @@ struct NextcloudLoginSuccessPage {
 }
 
 #[instrument(skip(state))]
-pub(crate) async fn post_nextcloud_flow(
+pub async fn post_nextcloud_flow(
     user: Principal,
     Extension(state): Extension<Arc<NextcloudFlows>>,
     Path(flow_id): Path<String>,
@@ -141,12 +144,12 @@ pub(crate) async fn post_nextcloud_flow(
         flow.app_name = form.app_name;
         flow.response = Some(NextcloudSuccessResponse {
             server: format!("https://{host}"),
-            login_name: user.id.to_owned(),
+            login_name: user.id.clone(),
             app_password: generate_app_token(),
         });
         Ok(Html(
             NextcloudLoginSuccessPage {
-                app_name: flow.app_name.to_owned(),
+                app_name: flow.app_name.clone(),
             }
             .render()
             .unwrap(),

crates/frontend/src/oidc_user_store.rs

@@ -1,8 +1,7 @@
-use std::sync::Arc;
-
 use async_trait::async_trait;
 use rustical_oidc::UserStore;
-use rustical_store::auth::{AuthenticationProvider, Principal};
+use rustical_store::auth::{AuthenticationProvider, Principal, PrincipalType};
+use std::sync::Arc;
 
 pub struct OidcUserStore<AP: AuthenticationProvider>(pub Arc<AP>);
 
@@ -26,7 +25,7 @@ impl<AP: AuthenticationProvider> UserStore for OidcUserStore<AP> {
                 Principal {
                     id: id.to_owned(),
                     displayname: None,
-                    principal_type: Default::default(),
+                    principal_type: PrincipalType::default(),
                     password: None,
                     memberships: vec![],
                 },

crates/frontend/src/routes/addressbook.rs

@@ -42,8 +42,8 @@ pub async fn route_addressbook_restore<AS: AddressbookStore>(
         return Ok(StatusCode::UNAUTHORIZED.into_response());
     }
     store.restore_addressbook(&owner, &addressbook_id).await?;
-    Ok(match referer {
-        Some(referer) => Redirect::to(&referer.to_string()).into_response(),
-        None => (StatusCode::CREATED, "Restored").into_response(),
-    })
+    Ok(referer.map_or_else(
+        || (StatusCode::CREATED, "Restored").into_response(),
+        |referer| Redirect::to(&referer.to_string()).into_response(),
+    ))
 }

crates/frontend/src/routes/app_token.rs

@@ -40,7 +40,7 @@ pub struct AppleConfig {
 }
 
 #[derive(Debug, Clone, Deserialize)]
-pub(crate) struct PostAppTokenForm {
+pub struct PostAppTokenForm {
     name: String,
     #[serde(default)]
     apple: bool,
@@ -57,7 +57,7 @@ pub async fn route_post_app_token<AP: AuthenticationProvider>(
     assert_eq!(user_id, user.id);
     let token = generate_app_token();
     let mut token_id = auth_provider
-        .add_app_token(&user.id, name.to_owned(), token.clone())
+        .add_app_token(&user.id, name.clone(), token.clone())
         .await?;
     // Get first 4 characters of token identifier
     token_id.truncate(4);
@@ -70,7 +70,7 @@ pub async fn route_post_app_token<AP: AuthenticationProvider>(
             hostname: hostname.clone(),
             caldav_principal_url: format!("https://{hostname}/caldav-compat/principal/{user_id}"),
             carddav_principal_url: format!("https://{hostname}/carddav/principal/{user_id}"),
-            user: user.id.to_owned(),
+            user: user.id.clone(),
             token,
             caldav_profile_uuid: Uuid::new_v4(),
             carddav_profile_uuid: Uuid::new_v4(),

crates/frontend/src/routes/calendar.rs

@@ -42,8 +42,8 @@ pub async fn route_calendar_restore<CS: CalendarStore>(
         return Ok(StatusCode::UNAUTHORIZED.into_response());
     }
     store.restore_calendar(&owner, &cal_id).await?;
-    Ok(match referer {
-        Some(referer) => Redirect::to(&referer.to_string()).into_response(),
-        None => (StatusCode::CREATED, "Restored").into_response(),
-    })
+    Ok(referer.map_or_else(
+        || (StatusCode::CREATED, "Restored").into_response(),
+        |referer| Redirect::to(&referer.to_string()).into_response(),
+    ))
 }

crates/frontend/src/routes/user.rs

@@ -10,10 +10,7 @@ use axum::{
 use axum_extra::{TypedHeader, extract::Host};
 use headers::UserAgent;
 use http::StatusCode;
-use rustical_store::{
-    AddressbookStore, CalendarStore,
-    auth::{AppToken, AuthenticationProvider, Principal},
-};
+use rustical_store::auth::{AppToken, AuthenticationProvider, Principal};
 
 use crate::pages::user::{Section, UserPage};
 
@@ -32,14 +29,8 @@ pub struct ProfileSection {
     pub davx5_hostname: Option<String>,
 }
 
-pub async fn route_user_named<
-    CS: CalendarStore,
-    AS: AddressbookStore,
-    AP: AuthenticationProvider,
->(
+pub async fn route_user_named<AP: AuthenticationProvider>(
     Path(user_id): Path<String>,
-    Extension(cal_store): Extension<Arc<CS>>,
-    Extension(addr_store): Extension<Arc<AS>>,
     Extension(auth_provider): Extension<Arc<AP>>,
     TypedHeader(user_agent): TypedHeader<UserAgent>,
     Host(host): Host,
@@ -49,26 +40,6 @@ pub async fn route_user_named<
         return StatusCode::UNAUTHORIZED.into_response();
     }
 
-    let mut calendars = vec![];
-    for group in user.memberships() {
-        calendars.extend(cal_store.get_calendars(group).await.unwrap());
-    }
-
-    let mut deleted_calendars = vec![];
-    for group in user.memberships() {
-        deleted_calendars.extend(cal_store.get_deleted_calendars(group).await.unwrap());
-    }
-
-    let mut addressbooks = vec![];
-    for group in user.memberships() {
-        addressbooks.extend(addr_store.get_addressbooks(group).await.unwrap());
-    }
-
-    let mut deleted_addressbooks = vec![];
-    for group in user.memberships() {
-        deleted_addressbooks.extend(addr_store.get_deleted_addressbooks(group).await.unwrap());
-    }
-
     let is_apple = user_agent.as_str().contains("Apple") || user_agent.as_str().contains("Mac OS");
     let davx5_hostname = user_agent.as_str().contains("Android").then_some(host);
 

crates/ical/Cargo.toml

@@ -15,7 +15,6 @@ thiserror.workspace = true
 derive_more.workspace = true
 rustical_xml.workspace = true
 ical.workspace = true
-lazy_static.workspace = true
 regex.workspace = true
 rrule.workspace = true
 serde.workspace = true

crates/ical/src/address_object.rs

@@ -22,7 +22,7 @@ impl TryFrom<VcardContact> for AddressObject {
     fn try_from(vcard: VcardContact) -> Result<Self, Self::Error> {
         let uid = vcard
             .get_uid()
-            .ok_or(Error::InvalidData("missing UID".to_owned()))?
+            .ok_or_else(|| Error::InvalidData("missing UID".to_owned()))?
             .to_owned();
         let vcf = vcard.generate();
         Ok(Self {
@@ -45,10 +45,12 @@ impl AddressObject {
         Ok(Self { id, vcf, vcard })
     }
 
+    #[must_use]
     pub fn get_id(&self) -> &str {
         &self.id
     }
 
+    #[must_use]
     pub fn get_etag(&self) -> String {
         let mut hasher = Sha256::new();
         hasher.update(self.get_id());
@@ -56,20 +58,24 @@ impl AddressObject {
         format!("\"{:x}\"", hasher.finalize())
     }
 
+    #[must_use]
     pub fn get_vcf(&self) -> &str {
         &self.vcf
     }
 
+    #[must_use]
     pub fn get_anniversary(&self) -> Option<(CalDateTime, bool)> {
         let prop = self.vcard.get_property("ANNIVERSARY")?.value.as_deref()?;
         CalDateTime::parse_vcard(prop).ok()
     }
 
+    #[must_use]
     pub fn get_birthday(&self) -> Option<(CalDateTime, bool)> {
         let prop = self.vcard.get_property("BDAY")?.value.as_deref()?;
         CalDateTime::parse_vcard(prop).ok()
     }
 
+    #[must_use]
     pub fn get_full_name(&self) -> Option<&str> {
         let prop = self.vcard.get_property("FN")?;
         prop.value.as_deref()
@@ -78,9 +84,7 @@ impl AddressObject {
     pub fn get_anniversary_object(&self) -> Result<Option<CalendarObject>, Error> {
         Ok(
             if let Some((anniversary, contains_year)) = self.get_anniversary() {
-                let fullname = if let Some(name) = self.get_full_name() {
-                    name
-                } else {
+                let Some(fullname) = self.get_full_name() else {
                     return Ok(None);
                 };
                 let anniversary = anniversary.date();
@@ -93,8 +97,9 @@ impl AddressObject {
                 let uid = format!("{}-anniversary", self.get_id());
 
                 let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
-                Some(CalendarObject::from_ics(format!(
-                    r#"BEGIN:VCALENDAR
+                Some(CalendarObject::from_ics(
+                    format!(
+                        r"BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
@@ -111,8 +116,10 @@ ACTION:DISPLAY
 DESCRIPTION:💍 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
-END:VCALENDAR"#,
-                ))?)
+END:VCALENDAR",
+                    ),
+                    None,
+                )?)
             } else {
                 None
             },
@@ -122,9 +129,7 @@ END:VCALENDAR"#,
     pub fn get_birthday_object(&self) -> Result<Option<CalendarObject>, Error> {
         Ok(
             if let Some((birthday, contains_year)) = self.get_birthday() {
-                let fullname = if let Some(name) = self.get_full_name() {
-                    name
-                } else {
+                let Some(fullname) = self.get_full_name() else {
                     return Ok(None);
                 };
                 let birthday = birthday.date();
@@ -134,8 +139,9 @@ END:VCALENDAR"#,
                 let uid = format!("{}-birthday", self.get_id());
 
                 let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
-                Some(CalendarObject::from_ics(format!(
-                    r#"BEGIN:VCALENDAR
+                Some(CalendarObject::from_ics(
+                    format!(
+                        r"BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
@@ -152,8 +158,10 @@ ACTION:DISPLAY
 DESCRIPTION:🎂 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
-END:VCALENDAR"#,
-                ))?)
+END:VCALENDAR",
+                    ),
+                    None,
+                )?)
             } else {
                 None
             },

crates/ical/src/error.rs

@@ -24,10 +24,12 @@ pub enum Error {
 }
 
 impl Error {
-    pub fn status_code(&self) -> StatusCode {
+    #[must_use]
+    pub const fn status_code(&self) -> StatusCode {
         match self {
-            Self::InvalidData(_) => StatusCode::BAD_REQUEST,
-            Self::MissingCalendar | Self::MissingContact => StatusCode::BAD_REQUEST,
+            Self::InvalidData(_) | Self::MissingCalendar | Self::MissingContact => {
+                StatusCode::BAD_REQUEST
+            }
             _ => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }

crates/ical/src/icalendar/event.rs

@@ -15,6 +15,7 @@ pub struct EventObject {
 }
 
 impl EventObject {
+    #[must_use]
     pub fn get_uid(&self) -> &str {
         self.event.get_uid()
     }
@@ -43,7 +44,7 @@ impl EventObject {
 
         if let Some(dtend) = self.get_dtend()? {
             return Ok(Some(dtend));
-        };
+        }
 
         let duration = self.event.get_duration().unwrap_or(Duration::days(1));
 
@@ -70,9 +71,9 @@ impl EventObject {
         for prop in &self.event.properties {
             rrule_set = match prop.name.as_str() {
                 "RRULE" => {
-                    let rrule = RRule::from_str(prop.value.as_ref().ok_or(Error::RRuleError(
-                        rrule::ParseError::MissingDateGenerationRules.into(),
-                    ))?)?
+                    let rrule = RRule::from_str(prop.value.as_ref().ok_or_else(|| {
+                        Error::RRuleError(rrule::ParseError::MissingDateGenerationRules.into())
+                    })?)?
                     .validate(dtstart)
                     .unwrap();
                     rrule_set.rrule(rrule)
@@ -96,7 +97,7 @@ impl EventObject {
         &self,
         start: Option<DateTime<Utc>>,
         end: Option<DateTime<Utc>>,
-        overrides: &[EventObject],
+        overrides: &[Self],
     ) -> Result<Vec<IcalEvent>, Error> {
         if let Some(mut rrule_set) = self.recurrence_ruleset()? {
             if let Some(start) = start {
@@ -120,8 +121,8 @@ impl EventObject {
                     date.format()
                 };
 
-                for _override in overrides {
-                    if let Some(override_id) = &_override
+                for ev_override in overrides {
+                    if let Some(override_id) = &ev_override
                         .event
                         .get_recurrence_id()
                         .as_ref()
@@ -131,7 +132,7 @@ impl EventObject {
                     {
                         // We have an override for this occurence
                         //
-                        events.push(_override.event.clone());
+                        events.push(ev_override.event.clone());
                         continue 'recurrence;
                     }
                 }
@@ -150,7 +151,7 @@ impl EventObject {
 
                 ev.set_property(Property {
                     name: "RECURRENCE-ID".to_string(),
-                    value: Some(dateformat.to_owned()),
+                    value: Some(dateformat.clone()),
                     params: None,
                 });
                 ev.set_property(Property {
@@ -185,7 +186,7 @@ mod tests {
     use crate::CalendarObject;
     use ical::generator::Emitter;
 
-    const ICS: &str = r#"BEGIN:VCALENDAR
+    const ICS: &str = r"BEGIN:VCALENDAR
 CALSCALE:GREGORIAN
 VERSION:2.0
 BEGIN:VTIMEZONE
@@ -203,7 +204,7 @@ SUMMARY:weekly stuff
 TRANSP:OPAQUE
 RRULE:FREQ=WEEKLY;COUNT=4;INTERVAL=2;BYDAY=TU,TH,SU
 END:VEVENT
-END:VCALENDAR"#;
+END:VCALENDAR";
 
     const EXPANDED: [&str; 4] = [
         "BEGIN:VEVENT\r
@@ -250,14 +251,8 @@ END:VEVENT\r\n",
 
     #[test]
     fn test_expand_recurrence() {
-        let event = CalendarObject::from_ics(ICS.to_string()).unwrap();
-        let (event, overrides) = if let crate::CalendarObjectComponent::Event(
-            main_event,
-            overrides,
-        ) = event.get_data()
-        {
-            (main_event, overrides)
-        } else {
+        let event = CalendarObject::from_ics(ICS.to_string(), None).unwrap();
+        let crate::CalendarObjectComponent::Event(event, overrides) = event.get_data() else {
             panic!()
         };
 

crates/ical/src/icalendar/object.rs

@@ -26,11 +26,12 @@ pub enum CalendarObjectType {
 }
 
 impl CalendarObjectType {
-    pub fn as_str(&self) -> &'static str {
+    #[must_use]
+    pub const fn as_str(&self) -> &'static str {
         match self {
-            CalendarObjectType::Event => "VEVENT",
-            CalendarObjectType::Todo => "VTODO",
-            CalendarObjectType::Journal => "VJOURNAL",
+            Self::Event => "VEVENT",
+            Self::Todo => "VTODO",
+            Self::Journal => "VJOURNAL",
         }
     }
 }
@@ -63,12 +64,25 @@ pub enum CalendarObjectComponent {
     Journal(IcalJournal, Vec<IcalJournal>),
 }
 
+impl CalendarObjectComponent {
+    #[must_use]
+    pub fn get_uid(&self) -> &str {
+        match &self {
+            // We've made sure before that the first component exists and all components share the
+            // same UID
+            Self::Todo(todo, _) => todo.get_uid(),
+            Self::Event(event, _) => event.event.get_uid(),
+            Self::Journal(journal, _) => journal.get_uid(),
+        }
+    }
+}
+
 impl From<&CalendarObjectComponent> for CalendarObjectType {
     fn from(value: &CalendarObjectComponent) -> Self {
         match value {
-            CalendarObjectComponent::Event(..) => CalendarObjectType::Event,
-            CalendarObjectComponent::Todo(..) => CalendarObjectType::Todo,
-            CalendarObjectComponent::Journal(..) => CalendarObjectType::Journal,
+            CalendarObjectComponent::Event(..) => Self::Event,
+            CalendarObjectComponent::Todo(..) => Self::Todo,
+            CalendarObjectComponent::Journal(..) => Self::Journal,
         }
     }
 }
@@ -140,12 +154,13 @@ impl CalendarObjectComponent {
 pub struct CalendarObject {
     data: CalendarObjectComponent,
     properties: Vec<Property>,
+    id: String,
     ics: String,
     vtimezones: HashMap<String, IcalTimeZone>,
 }
 
 impl CalendarObject {
-    pub fn from_ics(ics: String) -> Result<Self, Error> {
+    pub fn from_ics(ics: String, id: Option<String>) -> Result<Self, Error> {
         let mut parser = ical::IcalParser::new(BufReader::new(ics.as_bytes()));
         let cal = parser.next().ok_or(Error::MissingCalendar)??;
         if parser.next().is_some() {
@@ -154,10 +169,10 @@ impl CalendarObject {
             ));
         }
 
-        if !cal.events.is_empty() as u8
-            + !cal.todos.is_empty() as u8
-            + !cal.journals.is_empty() as u8
-            + !cal.free_busys.is_empty() as u8
+        if u8::from(!cal.events.is_empty())
+            + u8::from(!cal.todos.is_empty())
+            + u8::from(!cal.journals.is_empty())
+            + u8::from(!cal.free_busys.is_empty())
             != 1
         {
             // https://datatracker.ietf.org/doc/html/rfc4791#section-4.1
@@ -201,6 +216,7 @@ impl CalendarObject {
         };
 
         Ok(Self {
+            id: id.unwrap_or_else(|| data.get_uid().to_owned()),
             data,
             properties: cal.properties,
             ics,
@@ -208,39 +224,45 @@ impl CalendarObject {
         })
     }
 
-    pub fn get_vtimezones(&self) -> &HashMap<String, IcalTimeZone> {
+    #[must_use]
+    pub const fn get_vtimezones(&self) -> &HashMap<String, IcalTimeZone> {
         &self.vtimezones
     }
 
-    pub fn get_data(&self) -> &CalendarObjectComponent {
+    #[must_use]
+    pub const fn get_data(&self) -> &CalendarObjectComponent {
         &self.data
     }
 
-    pub fn get_id(&self) -> &str {
-        match &self.data {
-            // We've made sure before that the first component exists and all components share the
-            // same UID
-            CalendarObjectComponent::Todo(todo, _) => todo.get_uid(),
-            CalendarObjectComponent::Event(event, _) => event.event.get_uid(),
-            CalendarObjectComponent::Journal(journal, _) => journal.get_uid(),
-        }
+    #[must_use]
+    pub fn get_uid(&self) -> &str {
+        self.data.get_uid()
     }
 
+    #[must_use]
+    pub fn get_id(&self) -> &str {
+        &self.id
+    }
+
+    #[must_use]
     pub fn get_etag(&self) -> String {
         let mut hasher = Sha256::new();
-        hasher.update(self.get_id());
+        hasher.update(self.get_uid());
         hasher.update(self.get_ics());
         format!("\"{:x}\"", hasher.finalize())
     }
 
+    #[must_use]
     pub fn get_ics(&self) -> &str {
         &self.ics
     }
 
+    #[must_use]
     pub fn get_component_name(&self) -> &str {
         self.get_object_type().as_str()
     }
 
+    #[must_use]
     pub fn get_object_type(&self) -> CalendarObjectType {
         (&self.data).into()
     }
@@ -249,8 +271,8 @@ impl CalendarObject {
         match &self.data {
             CalendarObjectComponent::Event(main_event, overrides) => Ok(overrides
                 .iter()
-                .chain([main_event].into_iter())
-                .map(|event| event.get_dtstart())
+                .chain(std::iter::once(main_event))
+                .map(super::event::EventObject::get_dtstart)
                 .collect::<Result<Vec<_>, _>>()?
                 .into_iter()
                 .flatten()
@@ -263,8 +285,8 @@ impl CalendarObject {
         match &self.data {
             CalendarObjectComponent::Event(main_event, overrides) => Ok(overrides
                 .iter()
-                .chain([main_event].into_iter())
-                .map(|event| event.get_last_occurence())
+                .chain(std::iter::once(main_event))
+                .map(super::event::EventObject::get_last_occurence)
                 .collect::<Result<Vec<_>, _>>()?
                 .into_iter()
                 .flatten()

crates/ical/src/lib.rs

@@ -1,3 +1,5 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+#![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 mod timestamp;
 mod timezone;
 pub use timestamp::*;

crates/ical/src/timestamp.rs

@@ -3,14 +3,11 @@ use chrono::{DateTime, Datelike, Duration, Local, NaiveDate, NaiveDateTime, Naiv
 use chrono_tz::Tz;
 use derive_more::derive::Deref;
 use ical::property::Property;
-use lazy_static::lazy_static;
 use rustical_xml::{ValueDeserialize, ValueSerialize};
-use std::{borrow::Cow, collections::HashMap, ops::Add};
+use std::{borrow::Cow, collections::HashMap, ops::Add, sync::LazyLock};
 
-lazy_static! {
-    static ref RE_VCARD_DATE_MM_DD: regex::Regex =
-        regex::Regex::new(r"^--(?<m>\d{2})(?<d>\d{2})$").unwrap();
-}
+static RE_VCARD_DATE_MM_DD: LazyLock<regex::Regex> =
+    LazyLock::new(|| regex::Regex::new(r"^--(?<m>\d{2})(?<d>\d{2})$").unwrap());
 
 const LOCAL_DATE_TIME: &str = "%Y%m%dT%H%M%S";
 const UTC_DATE_TIME: &str = "%Y%m%dT%H%M%SZ";
@@ -73,7 +70,7 @@ impl From<CalDateTime> for DateTime<rrule::Tz> {
         value
             .as_datetime()
             .into_owned()
-            .with_timezone(&value.timezone().to_owned().into())
+            .with_timezone(&value.timezone().into())
     }
 }
 
@@ -102,13 +99,13 @@ impl Ord for CalDateTime {
 
 impl From<DateTime<Local>> for CalDateTime {
     fn from(value: DateTime<Local>) -> Self {
-        CalDateTime::DateTime(value.with_timezone(&ICalTimezone::Local))
+        Self::DateTime(value.with_timezone(&ICalTimezone::Local))
     }
 }
 
 impl From<DateTime<Utc>> for CalDateTime {
     fn from(value: DateTime<Utc>) -> Self {
-        CalDateTime::DateTime(value.with_timezone(&ICalTimezone::Olson(chrono_tz::UTC)))
+        Self::DateTime(value.with_timezone(&ICalTimezone::Olson(chrono_tz::UTC)))
     }
 }
 
@@ -137,9 +134,7 @@ impl CalDateTime {
         let prop_value = prop
             .value
             .as_ref()
-            .ok_or(CalDateTimeError::InvalidDatetimeFormat(
-                "empty property".to_owned(),
-            ))?;
+            .ok_or_else(|| CalDateTimeError::InvalidDatetimeFormat("empty property".into()))?;
 
         let timezone = if let Some(tzid) = prop.get_param("TZID") {
             if let Some(timezone) = timezones.get(tzid) {
@@ -158,6 +153,7 @@ impl CalDateTime {
         Self::parse(prop_value, timezone)
     }
 
+    #[must_use]
     pub fn format(&self) -> String {
         match self {
             Self::DateTime(datetime) => match datetime.timezone() {
@@ -168,6 +164,7 @@ impl CalDateTime {
         }
     }
 
+    #[must_use]
     pub fn format_date(&self) -> String {
         match self {
             Self::DateTime(datetime) => datetime.format(LOCAL_DATE).to_string(),
@@ -175,6 +172,7 @@ impl CalDateTime {
         }
     }
 
+    #[must_use]
     pub fn date(&self) -> NaiveDate {
         match self {
             Self::DateTime(datetime) => datetime.date_naive(),
@@ -182,10 +180,12 @@ impl CalDateTime {
         }
     }
 
-    pub fn is_date(&self) -> bool {
+    #[must_use]
+    pub const fn is_date(&self) -> bool {
         matches!(&self, Self::Date(_, _))
     }
 
+    #[must_use]
     pub fn as_datetime(&self) -> Cow<'_, DateTime<ICalTimezone>> {
         match self {
             Self::DateTime(datetime) => Cow::Borrowed(datetime),
@@ -201,14 +201,14 @@ impl CalDateTime {
     pub fn parse(value: &str, timezone: Option<Tz>) -> Result<Self, CalDateTimeError> {
         if let Ok(datetime) = NaiveDateTime::parse_from_str(value, LOCAL_DATE_TIME) {
             if let Some(timezone) = timezone {
-                return Ok(CalDateTime::DateTime(
+                return Ok(Self::DateTime(
                     datetime
                         .and_local_timezone(timezone.into())
                         .earliest()
                         .ok_or(CalDateTimeError::LocalTimeGap)?,
                 ));
             }
-            return Ok(CalDateTime::DateTime(
+            return Ok(Self::DateTime(
                 datetime
                     .and_local_timezone(ICalTimezone::Local)
                     .earliest()
@@ -219,18 +219,16 @@ impl CalDateTime {
         if let Ok(datetime) = NaiveDateTime::parse_from_str(value, UTC_DATE_TIME) {
             return Ok(datetime.and_utc().into());
         }
-        let timezone = timezone
-            .map(ICalTimezone::Olson)
-            .unwrap_or(ICalTimezone::Local);
+        let timezone = timezone.map_or(ICalTimezone::Local, ICalTimezone::Olson);
         if let Ok(date) = NaiveDate::parse_from_str(value, LOCAL_DATE) {
-            return Ok(CalDateTime::Date(date, timezone));
+            return Ok(Self::Date(date, timezone));
         }
 
         if let Ok(date) = NaiveDate::parse_from_str(value, "%Y-%m-%d") {
-            return Ok(CalDateTime::Date(date, timezone));
+            return Ok(Self::Date(date, timezone));
         }
         if let Ok(date) = NaiveDate::parse_from_str(value, "%Y%m%d") {
-            return Ok(CalDateTime::Date(date, timezone));
+            return Ok(Self::Date(date, timezone));
         }
 
         Err(CalDateTimeError::InvalidDatetimeFormat(value.to_string()))
@@ -250,9 +248,9 @@ impl CalDateTime {
             let day = captures.name("d").unwrap().as_str().parse().ok().unwrap();
 
             return Ok((
-                CalDateTime::Date(
+                Self::Date(
                     NaiveDate::from_ymd_opt(year, month, day)
-                        .ok_or(CalDateTimeError::ParseError(value.to_string()))?,
+                        .ok_or_else(|| CalDateTimeError::ParseError(value.to_string()))?,
                     ICalTimezone::Local,
                 ),
                 false,
@@ -261,14 +259,16 @@ impl CalDateTime {
         Err(CalDateTimeError::InvalidDatetimeFormat(value.to_string()))
     }
 
+    #[must_use]
     pub fn utc(&self) -> DateTime<Utc> {
         self.as_datetime().to_utc()
     }
 
+    #[must_use]
     pub fn timezone(&self) -> ICalTimezone {
         match &self {
-            CalDateTime::DateTime(datetime) => datetime.timezone(),
-            CalDateTime::Date(_, tz) => tz.to_owned(),
+            Self::DateTime(datetime) => datetime.timezone(),
+            Self::Date(_, tz) => tz.to_owned(),
         }
     }
 }
@@ -282,109 +282,99 @@ impl From<CalDateTime> for DateTime<Utc> {
 impl Datelike for CalDateTime {
     fn year(&self) -> i32 {
         match &self {
-            CalDateTime::DateTime(datetime) => datetime.year(),
-            CalDateTime::Date(date, _) => date.year(),
+            Self::DateTime(datetime) => datetime.year(),
+            Self::Date(date, _) => date.year(),
         }
     }
     fn month(&self) -> u32 {
         match &self {
-            CalDateTime::DateTime(datetime) => datetime.month(),
-            CalDateTime::Date(date, _) => date.month(),
+            Self::DateTime(datetime) => datetime.month(),
+            Self::Date(date, _) => date.month(),
         }
     }
 
     fn month0(&self) -> u32 {
         match &self {
-            CalDateTime::DateTime(datetime) => datetime.month0(),
-            CalDateTime::Date(date, _) => date.month0(),
+            Self::DateTime(datetime) => datetime.month0(),
+            Self::Date(date, _) => date.month0(),
         }
     }
     fn day(&self) -> u32 {
         match &self {
-            CalDateTime::DateTime(datetime) => datetime.day(),
-            CalDateTime::Date(date, _) => date.day(),
+            Self::DateTime(datetime) => datetime.day(),
+            Self::Date(date, _) => date.day(),
         }
     }
     fn day0(&self) -> u32 {
         match &self {
-            CalDateTime::DateTime(datetime) => datetime.day0(),
-            CalDateTime::Date(date, _) => date.day0(),
+            Self::DateTime(datetime) => datetime.day0(),
+            Self::Date(date, _) => date.day0(),
         }
     }
     fn ordinal(&self) -> u32 {
         match &self {
-            CalDateTime::DateTime(datetime) => datetime.ordinal(),
-            CalDateTime::Date(date, _) => date.ordinal(),
+            Self::DateTime(datetime) => datetime.ordinal(),
+            Self::Date(date, _) => date.ordinal(),
         }
     }
     fn ordinal0(&self) -> u32 {
         match &self {
-            CalDateTime::DateTime(datetime) => datetime.ordinal0(),
-            CalDateTime::Date(date, _) => date.ordinal0(),
+            Self::DateTime(datetime) => datetime.ordinal0(),
+            Self::Date(date, _) => date.ordinal0(),
         }
     }
     fn weekday(&self) -> chrono::Weekday {
         match &self {
-            CalDateTime::DateTime(datetime) => datetime.weekday(),
-            CalDateTime::Date(date, _) => date.weekday(),
+            Self::DateTime(datetime) => datetime.weekday(),
+            Self::Date(date, _) => date.weekday(),
         }
     }
     fn iso_week(&self) -> chrono::IsoWeek {
         match &self {
-            CalDateTime::DateTime(datetime) => datetime.iso_week(),
-            CalDateTime::Date(date, _) => date.iso_week(),
+            Self::DateTime(datetime) => datetime.iso_week(),
+            Self::Date(date, _) => date.iso_week(),
         }
     }
     fn with_year(&self, year: i32) -> Option<Self> {
         match &self {
-            CalDateTime::DateTime(datetime) => Some(Self::DateTime(datetime.with_year(year)?)),
-            CalDateTime::Date(date, tz) => Some(Self::Date(date.with_year(year)?, tz.to_owned())),
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_year(year)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_year(year)?, tz.to_owned())),
         }
     }
     fn with_month(&self, month: u32) -> Option<Self> {
         match &self {
-            CalDateTime::DateTime(datetime) => Some(Self::DateTime(datetime.with_month(month)?)),
-            CalDateTime::Date(date, tz) => Some(Self::Date(date.with_month(month)?, tz.to_owned())),
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_month(month)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_month(month)?, tz.to_owned())),
         }
     }
     fn with_month0(&self, month0: u32) -> Option<Self> {
         match &self {
-            CalDateTime::DateTime(datetime) => Some(Self::DateTime(datetime.with_month0(month0)?)),
-            CalDateTime::Date(date, tz) => {
-                Some(Self::Date(date.with_month0(month0)?, tz.to_owned()))
-            }
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_month0(month0)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_month0(month0)?, tz.to_owned())),
         }
     }
     fn with_day(&self, day: u32) -> Option<Self> {
         match &self {
-            CalDateTime::DateTime(datetime) => Some(Self::DateTime(datetime.with_day(day)?)),
-            CalDateTime::Date(date, tz) => Some(Self::Date(date.with_day(day)?, tz.to_owned())),
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_day(day)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_day(day)?, tz.to_owned())),
         }
     }
     fn with_day0(&self, day0: u32) -> Option<Self> {
         match &self {
-            CalDateTime::DateTime(datetime) => Some(Self::DateTime(datetime.with_day0(day0)?)),
-            CalDateTime::Date(date, tz) => Some(Self::Date(date.with_day0(day0)?, tz.to_owned())),
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_day0(day0)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_day0(day0)?, tz.to_owned())),
         }
     }
     fn with_ordinal(&self, ordinal: u32) -> Option<Self> {
         match &self {
-            CalDateTime::DateTime(datetime) => {
-                Some(Self::DateTime(datetime.with_ordinal(ordinal)?))
-            }
-            CalDateTime::Date(date, tz) => {
-                Some(Self::Date(date.with_ordinal(ordinal)?, tz.to_owned()))
-            }
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_ordinal(ordinal)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_ordinal(ordinal)?, tz.to_owned())),
         }
     }
     fn with_ordinal0(&self, ordinal0: u32) -> Option<Self> {
         match &self {
-            CalDateTime::DateTime(datetime) => {
-                Some(Self::DateTime(datetime.with_ordinal0(ordinal0)?))
-            }
-            CalDateTime::Date(date, tz) => {
-                Some(Self::Date(date.with_ordinal0(ordinal0)?, tz.to_owned()))
-            }
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_ordinal0(ordinal0)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_ordinal0(ordinal0)?, tz.to_owned())),
         }
     }
 }

crates/ical/src/timezone.rs

@@ -26,7 +26,7 @@ impl From<rrule::Tz> for ICalTimezone {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Display)]
+#[derive(Debug, Clone, PartialEq, Eq, Display)]
 pub enum CalTimezoneOffset {
     Local(chrono::FixedOffset),
     Olson(chrono_tz::TzOffset),

crates/ical/tests/test_cal_object.rs

@@ -25,6 +25,6 @@ END:VCALENDAR
 
 #[test]
 fn parse_calendar_object() {
-    let object = CalendarObject::from_ics(MULTI_VEVENT.to_string()).unwrap();
+    let object = CalendarObject::from_ics(MULTI_VEVENT.to_string(), None).unwrap();
     object.expand_recurrence(None, None).unwrap();
 }

crates/oidc/Cargo.toml

@@ -14,7 +14,7 @@ reqwest.workspace = true
 thiserror.workspace = true
 async-trait.workspace = true
 axum.workspace = true
-tower-sessions = "0.14"
+tower-sessions.workspace = true
 axum-extra.workspace = true
 headers.workspace = true
 tracing.workspace = true

crates/oidc/src/lib.rs

@@ -1,3 +1,5 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+#![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 use axum::{
     Extension, Form,
     extract::Query,
@@ -82,7 +84,7 @@ async fn get_oidc_client(
         })?;
 
     Ok(CoreClient::from_provider_metadata(
-        provider_metadata.clone(),
+        provider_metadata,
         client_id.clone(),
         client_secret.clone(),
     )

crates/store/Cargo.toml

@@ -15,7 +15,6 @@ sha2 = { workspace = true }
 ical = { workspace = true }
 chrono = { workspace = true }
 regex = { workspace = true }
-lazy_static = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 chrono-tz = { workspace = true }

crates/store/src/addressbook.rs

@@ -14,6 +14,7 @@ pub struct Addressbook {
 }
 
 impl Addressbook {
+    #[must_use]
     pub fn format_synctoken(&self) -> String {
         format_synctoken(self.synctoken)
     }

crates/store/src/auth/middleware.rs

@@ -23,7 +23,7 @@ impl<AP: AuthenticationProvider> Clone for AuthenticationLayer<AP> {
 }
 
 impl<AP: AuthenticationProvider> AuthenticationLayer<AP> {
-    pub fn new(auth_provider: Arc<AP>) -> Self {
+    pub const fn new(auth_provider: Arc<AP>) -> Self {
         Self { auth_provider }
     }
 }
@@ -53,9 +53,9 @@ impl<S: Clone, AP: AuthenticationProvider> Clone for AuthenticationMiddleware<S,
     }
 }
 
-impl<S: Clone, AP: AuthenticationProvider> Service<Request> for AuthenticationMiddleware<S, AP>
+impl<S, AP: AuthenticationProvider> Service<Request> for AuthenticationMiddleware<S, AP>
 where
-    S: Service<Request, Response = Response> + Send + 'static,
+    S: Service<Request, Response = Response> + Send + Clone + 'static,
     S::Future: Send + 'static,
 {
     type Response = S::Response;

crates/store/src/auth/principal.rs

@@ -35,6 +35,7 @@ impl Principal {
     /// Returns true if the user is either
     /// - the principal itself
     /// - has full access to the prinicpal (is member)
+    #[must_use]
     pub fn is_principal(&self, principal: &str) -> bool {
         if self.id == principal {
             return true;