From cd5386de368e6a8d31d3649b1ff85ec2d70ad556 Mon Sep 17 00:00:00 2001 From: Javier Feliz Date: Thu, 11 Sep 2025 20:54:18 -0400 Subject: [PATCH] More linting --- waycast-core/src/lib.rs | 4 ++-- waycast-gtk/src/main.rs | 1 - waycast-gtk/src/util/files.rs | 26 -------------------------- waycast-gtk/src/util/mod.rs | 1 - waycast-plugins/src/file_search.rs | 2 +- 5 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 waycast-gtk/src/util/files.rs delete mode 100644 waycast-gtk/src/util/mod.rs diff --git a/waycast-core/src/lib.rs b/waycast-core/src/lib.rs index ee28fab..00aa5d4 100644 --- a/waycast-core/src/lib.rs +++ b/waycast-core/src/lib.rs @@ -79,9 +79,9 @@ impl WaycastLauncher { p.init(); } - self.plugins.sort_by(|a, b| b.priority().cmp(&a.priority())); + self.plugins.sort_by_key(|b| std::cmp::Reverse(b.priority())); self.plugins_show_always - .sort_by(|a, b| b.priority().cmp(&a.priority())); + .sort_by_key(|b| std::cmp::Reverse(b.priority())); self } diff --git a/waycast-gtk/src/main.rs b/waycast-gtk/src/main.rs index 6b1bbcf..0fbb480 100644 --- a/waycast-gtk/src/main.rs +++ b/waycast-gtk/src/main.rs @@ -1,5 +1,4 @@ mod ui; -mod util; use gtk::prelude::*; use gtk::Application; diff --git a/waycast-gtk/src/util/files.rs b/waycast-gtk/src/util/files.rs deleted file mode 100644 index e3a404f..0000000 --- a/waycast-gtk/src/util/files.rs +++ /dev/null @@ -1,26 +0,0 @@ -use std::path::{Path, PathBuf}; -use std::{fs, io}; - -pub fn get_files_with_extension>( - dir: P, - extension: &str, -) -> io::Result> { - let entries = fs::read_dir(dir)?; - let desktop_files: Vec<_> = entries - .filter_map(|res| res.ok()) - .map(|f| f.path()) - .filter(|path| { - path.extension() - .and_then(|ext| ext.to_str()) - .map(|ext| ext == extension) - .unwrap_or(false) - }) - .collect(); - - let mut files = Vec::new(); - for f in desktop_files { - files.push(f); - } - - Ok(files) -} diff --git a/waycast-gtk/src/util/mod.rs b/waycast-gtk/src/util/mod.rs deleted file mode 100644 index d3ab969..0000000 --- a/waycast-gtk/src/util/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod files; diff --git a/waycast-plugins/src/file_search.rs b/waycast-plugins/src/file_search.rs index 696525f..c08c9ba 100644 --- a/waycast-plugins/src/file_search.rs +++ b/waycast-plugins/src/file_search.rs @@ -204,7 +204,7 @@ impl FileSearchPlugin { }; // Run the scan with a timeout - if let Err(_) = tokio::time::timeout(timeout, scan_task).await { + if tokio::time::timeout(timeout, scan_task).await.is_err() { eprintln!("File indexing timed out after {:?}", timeout); } }