lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Use is_some_and

Browse source
This commit is contained in:
FineFindus 2023-06-26 11:59:17 +00:00 • committed by Sophie Herold
parent 1a39751402
commit bc9aff5068
5 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/image_metadata/gps.rs
View file

@ -81,10 +81,8 @@ impl GPSCoord {
}
}
if let Some(min_) = min {
if deg.denom > 1 && min_.num == 0 {
min = None;
}
if min.is_some_and(|min_| deg.denom > 1 && min_.num == 0) {
min = None;
}
Some((

10
src/image_metadata/mod.rs
View file

@ -142,10 +142,12 @@ impl ImageMetadata {
}
pub fn f_number(&self) -> Option<String> {
if let Some(exif) = &self.exif {
if let Some(field) = exif.get_field(exif::Tag::FNumber, exif::In::PRIMARY) {
return Some(format!("ƒ\u{2215}{}", field.display_value()));
}
if let Some(field) = self
.exif
.as_ref()
.and_then(|exif| exif.get_field(exif::Tag::FNumber, exif::In::PRIMARY))
{
return Some(format!("ƒ\u{2215}{}", field.display_value()));
}
None