From c96b464bed616d40f1204136c0c5a739fe6fe7ba Mon Sep 17 00:00:00 2001 From: Mel Date: Tue, 21 Sep 2021 23:55:00 +0200 Subject: Fix clippy complaints --- src/files.rs | 10 ++++------ src/history.rs | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/files.rs b/src/files.rs index 3b6e9cb..41dbad1 100644 --- a/src/files.rs +++ b/src/files.rs @@ -26,12 +26,12 @@ impl Locations { fs::read_dir(&self.ka_files_path).context("Failed reading history file entries.")?; let working_files = Self::walk_directory(working_entries, &|entry| { - FileState::from_working(&self, &entry.path()).ok() + FileState::from_working(self, &entry.path()).ok() })?; let deleted_files = Self::walk_directory(history_entries, &|entry| { let file_path = entry.path(); - let file = FileState::from_history(&self, &file_path).ok()?; + let file = FileState::from_history(self, &file_path).ok()?; match file { FileState::Deleted { .. } => Some(file), FileState::Tracked { .. } => None, @@ -68,10 +68,8 @@ impl Locations { let nested_directory = fs::read_dir(entry.path())?; let nested_files = Self::walk_directory(nested_directory, filter_map)?; entries.extend(nested_files); - } else { - if let Some(states) = filter_map(entry) { - entries.push(states); - } + } else if let Some(states) = filter_map(entry) { + entries.push(states); } } diff --git a/src/history.rs b/src/history.rs index ce5ae26..3f5e43f 100644 --- a/src/history.rs +++ b/src/history.rs @@ -22,7 +22,7 @@ impl FileHistory { .context("Failed reading file history.")?; let file_history = serde_json::from_slice::(&buffer); - Ok(file_history.context("Corrupted file history.")?) + file_history.context("Corrupted file history.") } pub fn write_to_file(&self, file: &mut File) -> anyhow::Result<()> { -- cgit 1.4.1