nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-15 15:02:29 +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

28
crates/ical/src/address_object.rs
View File

@@ -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,32 +45,38 @@ impl AddressObject {
Ok(Self { id, vcf, vcard })
}
#[must_use] pub fn get_id(&self) -> &str {
#[must_use]
pub fn get_id(&self) -> &str {
&self.id
}
#[must_use] pub fn get_etag(&self) -> String {
#[must_use]
pub fn get_etag(&self) -> String {
let mut hasher = Sha256::new();
hasher.update(self.get_id());
hasher.update(self.get_vcf());
format!("\"{:x}\"", hasher.finalize())
}
#[must_use] pub fn get_vcf(&self) -> &str {
#[must_use]
pub fn get_vcf(&self) -> &str {
&self.vcf
}
#[must_use] pub fn get_anniversary(&self) -> Option<(CalDateTime, bool)> {
#[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)> {
#[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> {
#[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();
@@ -122,9 +126,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();