mirror of
https://github.com/lennart-k/rustical.git
synced 2025-12-23 01:59:23 +00:00
Lots of clippy appeasement
This commit is contained in:
@@ -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),
|
||||
|
||||
@@ -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()),
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user