diff --git a/client/src/component/entry.rs b/client/src/component/entry.rs index 6db29400..c7cce954 100644 --- a/client/src/component/entry.rs +++ b/client/src/component/entry.rs @@ -19,7 +19,7 @@ fn clipped_title(title: String) -> String { let mut clipped_title: String = title .char_indices() - .filter_map(|(_, character)| Some(character)) + .map(|(_, character)| character) .take(57) .collect(); clipped_title.push_str("..."); diff --git a/client/src/main.rs b/client/src/main.rs index fbc116b5..9109ac43 100644 --- a/client/src/main.rs +++ b/client/src/main.rs @@ -57,11 +57,11 @@ impl Application for Centerpiece { iced::font::load( include_bytes!("../assets/FiraCode/FiraCodeNerdFont-Regular.ttf").as_slice(), ) - .map(|font_loading_result| Message::FontLoaded(font_loading_result)), + .map(Message::FontLoaded), iced::font::load( include_bytes!("../assets/FiraCode/FiraCodeNerdFont-Light.ttf").as_slice(), ) - .map(|font_loading_result| Message::FontLoaded(font_loading_result)), + .map(Message::FontLoaded), iced::Command::perform(async {}, move |()| Message::Loaded), ]), ) @@ -385,8 +385,7 @@ impl Centerpiece { plugin .entries .iter() - .find(|entry| entry.id.eq(active_entry_id)) - .is_some() + .any(|entry| entry.id.eq(active_entry_id)) }) .unwrap_or(0) as f32, None => 0.0, diff --git a/client/src/plugin/utils.rs b/client/src/plugin/utils.rs index 25a895d1..1e19aa66 100644 --- a/client/src/plugin/utils.rs +++ b/client/src/plugin/utils.rs @@ -124,7 +124,7 @@ pub trait Plugin { fn search( &mut self, - query: &String, + query: &str, plugin_channel_out: &mut iced::futures::channel::mpsc::Sender, ) -> anyhow::Result<()> { let filtered_entries = crate::plugin::utils::search(self.entries(), query); @@ -151,7 +151,7 @@ pub trait Plugin { } } -pub fn search(entries: Vec, query: &String) -> Vec { +pub fn search(entries: Vec, query: &str) -> Vec { if query.is_empty() { let mut sorted_entries = entries.clone(); sorted_entries.sort_by_key(|entry| entry.title.clone());