nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2026-01-31 07:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lots of clippy appeasement

Browse Source
This commit is contained in:
Lennart
2025-10-27 20:12:21 +01:00
parent 0d071d3b92
commit 86cf490fa9
84 changed files with 413 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/caldav/src/calendar/methods/report/calendar_multiget.rs
View File

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

14
crates/caldav/src/calendar/methods/report/calendar_query/elements.rs
View File

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

6
crates/caldav/src/calendar/methods/report/calendar_query/mod.rs
View File

@@ -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
}
)
);
}
}

12
crates/caldav/src/calendar/methods/report/mod.rs
View File

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