From 76c03fa4d4bac5c2501f5ae75b6b745530244182 Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Sat, 30 Aug 2025 11:56:58 +0200 Subject: [PATCH] clippy appeasement --- .../calendar/methods/report/calendar_query.rs | 40 +++++++++---------- crates/caldav/src/principal/tests.rs | 2 +- crates/dav/src/xml/tag_list.rs | 6 +-- crates/frontend/src/assets.rs | 1 + crates/oidc/src/lib.rs | 17 ++++---- crates/store/src/auth/middleware.rs | 11 +++-- crates/store_sqlite/src/addressbook_store.rs | 12 +++--- crates/store_sqlite/src/calendar_store.rs | 12 +++--- 8 files changed, 48 insertions(+), 53 deletions(-) diff --git a/crates/caldav/src/calendar/methods/report/calendar_query.rs b/crates/caldav/src/calendar/methods/report/calendar_query.rs index fc26f5e..5606c62 100644 --- a/crates/caldav/src/calendar/methods/report/calendar_query.rs +++ b/crates/caldav/src/calendar/methods/report/calendar_query.rs @@ -116,19 +116,17 @@ impl CompFilterElement { // 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 { - if let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None) { - if start.deref() > &last_occurence.utc() { - return false; - } - }; + if let Some(start) = &time_range.start + && let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None) + && start.deref() > &last_occurence.utc() + { + return false; } - if let Some(end) = &time_range.end { - if let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None) { - if end.deref() < &first_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() + { + return false; } } true @@ -156,15 +154,15 @@ impl From<&FilterElement> for CalendarQuery { for comp_filter in comp_filter_vcalendar.comp_filter.iter() { // 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") { - if let Some(time_range) = &comp_filter.time_range { - 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 { - time_start: start, - time_end: end, - }; - } + if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO") + && let Some(time_range) = &comp_filter.time_range + { + 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 { + time_start: start, + time_end: end, + }; } } Default::default() diff --git a/crates/caldav/src/principal/tests.rs b/crates/caldav/src/principal/tests.rs index e18e6e2..f8700a7 100644 --- a/crates/caldav/src/principal/tests.rs +++ b/crates/caldav/src/principal/tests.rs @@ -79,5 +79,5 @@ async fn test_propfind() { ) .unwrap(); - let output = response.serialize_to_string().unwrap(); + let _output = response.serialize_to_string().unwrap(); } diff --git a/crates/dav/src/xml/tag_list.rs b/crates/dav/src/xml/tag_list.rs index 6aa890d..bf7b126 100644 --- a/crates/dav/src/xml/tag_list.rs +++ b/crates/dav/src/xml/tag_list.rs @@ -35,10 +35,8 @@ impl XmlSerialize for TagList { if let Some(qname) = &qname { let mut bytes_start = BytesStart::from(qname.to_owned()); - if !has_prefix { - if let Some(ns) = &ns { - bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref())); - } + if !has_prefix && let Some(ns) = &ns { + bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref())); } writer.write_event(Event::Start(bytes_start))?; } diff --git a/crates/frontend/src/assets.rs b/crates/frontend/src/assets.rs index d640180..bb65521 100644 --- a/crates/frontend/src/assets.rs +++ b/crates/frontend/src/assets.rs @@ -13,6 +13,7 @@ use tower::Service; #[derive(Clone, RustEmbed, Default)] #[folder = "public/assets"] +#[allow(dead_code)] // Since this is not used with the frontend-dev feature pub struct Assets; #[derive(Clone, Default)] diff --git a/crates/oidc/src/lib.rs b/crates/oidc/src/lib.rs index 6da7038..0806156 100644 --- a/crates/oidc/src/lib.rs +++ b/crates/oidc/src/lib.rs @@ -192,20 +192,19 @@ pub async fn route_get_oidc_callback( .await .map_err(|e| OidcError::UserInfo(e.to_string()))?; - if let Some(require_group) = &oidc_config.require_group { - if !user_info_claims + if let Some(require_group) = &oidc_config.require_group + && !user_info_claims .additional_claims() .groups .clone() .unwrap_or_default() .contains(require_group) - { - return Ok(( - StatusCode::UNAUTHORIZED, - "User is not in an authorized group to use RustiCal", - ) - .into_response()); - } + { + return Ok(( + StatusCode::UNAUTHORIZED, + "User is not in an authorized group to use RustiCal", + ) + .into_response()); } let user_id = match oidc_config.claim_userid { diff --git a/crates/store/src/auth/middleware.rs b/crates/store/src/auth/middleware.rs index 3766cad..eaf6ad9 100644 --- a/crates/store/src/auth/middleware.rs +++ b/crates/store/src/auth/middleware.rs @@ -72,12 +72,11 @@ where let mut inner = self.inner.clone(); Box::pin(async move { - if let Some(session) = request.extensions().get::() { - if let Ok(Some(user_id)) = session.get::("user").await { - if let Ok(Some(user)) = ap.get_principal(&user_id).await { - request.extensions_mut().insert(user); - } - } + if let Some(session) = request.extensions().get::() + && let Ok(Some(user_id)) = session.get::("user").await + && let Ok(Some(user)) = ap.get_principal(&user_id).await + { + request.extensions_mut().insert(user); } if let Some(auth) = auth_header { diff --git a/crates/store_sqlite/src/addressbook_store.rs b/crates/store_sqlite/src/addressbook_store.rs index ddcc4f6..2928f9d 100644 --- a/crates/store_sqlite/src/addressbook_store.rs +++ b/crates/store_sqlite/src/addressbook_store.rs @@ -433,14 +433,14 @@ impl AddressbookStore for SqliteAddressbookStore { Self::_delete_addressbook(&mut *tx, principal, addressbook_id, use_trashbin).await?; tx.commit().await.map_err(crate::Error::from)?; - if let Some(addressbook) = addressbook { - if let Err(err) = self.sender.try_send(CollectionOperation { + if let Some(addressbook) = addressbook + && let Err(err) = self.sender.try_send(CollectionOperation { data: CollectionOperationInfo::Delete, topic: addressbook.push_topic, - }) { - error!("Push notification about deleted addressbook failed: {err}"); - }; - } + }) + { + error!("Push notification about deleted addressbook failed: {err}"); + }; Ok(()) } diff --git a/crates/store_sqlite/src/calendar_store.rs b/crates/store_sqlite/src/calendar_store.rs index 82edfc2..11cfdc8 100644 --- a/crates/store_sqlite/src/calendar_store.rs +++ b/crates/store_sqlite/src/calendar_store.rs @@ -554,14 +554,14 @@ impl CalendarStore for SqliteCalendarStore { Self::_delete_calendar(&mut *tx, principal, id, use_trashbin).await?; tx.commit().await.map_err(crate::Error::from)?; - if let Some(cal) = cal { - if let Err(err) = self.sender.try_send(CollectionOperation { + if let Some(cal) = cal + && let Err(err) = self.sender.try_send(CollectionOperation { data: CollectionOperationInfo::Delete, topic: cal.push_topic, - }) { - error!("Push notification about deleted calendar failed: {err}"); - }; - } + }) + { + error!("Push notification about deleted calendar failed: {err}"); + }; Ok(()) }