Skip to content

Commit 84e82e3

Browse files
committed
fix: Impl Hash for PathSource
1 parent 38eff03 commit 84e82e3

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "freedesktop-desktop-entry"
3-
version = "0.3.1"
3+
version = "0.3.2"
44
authors = ["Michael Aaron Murphy <[email protected]>"]
55
edition = "2018"
66
homepage = "https://codeberg.org/mmstick/freedesktop-desktop-entry"

src/iter.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ impl Iterator for Iter {
4646
if let Ok(file_type) = entry.file_type() {
4747
if file_type.is_dir() {
4848
self.directories_to_walk.push((path_src.clone(), path));
49-
} else if file_type.is_file() || file_type.is_symlink() {
50-
if path.extension().map_or(false, |ext| ext == "desktop") {
51-
self.actively_walking = Some((path_src.clone(), iterator));
52-
return Some((path_src, path));
53-
}
49+
} else if (file_type.is_file() || file_type.is_symlink())
50+
&& path.extension().map_or(false, |ext| ext == "desktop")
51+
{
52+
self.actively_walking = Some((path_src.clone(), iterator));
53+
return Some((path_src, path));
5454
}
5555
}
5656
}

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ impl<'a> DesktopEntry<'a> {
181181
group.and_then(|group| group.get(key)).and_then(|key| {
182182
locale
183183
.and_then(|locale| key.1.get(locale).cloned())
184-
.or_else(|| Some(key.0))
184+
.or(Some(key.0))
185185
})
186186
}
187187
}
@@ -205,7 +205,7 @@ impl<'a> Display for DesktopEntry<'a> {
205205
}
206206
}
207207

208-
#[derive(Debug, Clone, PartialEq, Eq)]
208+
#[derive(Debug, Clone, Hash, PartialEq, Eq)]
209209
pub enum PathSource {
210210
Local,
211211
LocalDesktop,

0 commit comments

Comments
 (0)