mirror of
https://github.com/lennart-k/rustical.git
synced 2025-12-23 17:29:31 +00:00
Lots of clippy appeasement
This commit is contained in:
@@ -78,7 +78,7 @@ pub async fn put_event<C: CalendarStore>(
|
||||
true
|
||||
};
|
||||
|
||||
let object = if let Ok(obj) = CalendarObject::from_ics(body.clone()) { obj } else {
|
||||
let Ok(object) = CalendarObject::from_ics(body.clone()) else {
|
||||
debug!("invalid calendar data:\n{body}");
|
||||
return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
|
||||
};
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
use super::prop::{CalendarObjectPropWrapper, CalendarObjectPropWrapperName, CalendarObjectPropName, CalendarObjectProp, CalendarData};
|
||||
use super::prop::{
|
||||
CalendarData, CalendarObjectProp, CalendarObjectPropName, CalendarObjectPropWrapper,
|
||||
CalendarObjectPropWrapperName,
|
||||
};
|
||||
use crate::Error;
|
||||
use derive_more::derive::{From, Into};
|
||||
use rustical_dav::{
|
||||
|
||||
@@ -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()),
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user