From 1b353542722ac70b99e5a4f846e68ae68a2870fd Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Mon, 1 Apr 2024 16:33:38 +0100
Subject: [PATCH] refactor: fix clippy warnings

---
 src/main.rs                  |  4 ++--
 src/modules/custom/mod.rs    |  2 +-
 src/modules/notifications.rs |  4 ++--
 src/modules/tray/mod.rs      | 15 +++++++--------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index b821f54..7a9f116 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -192,7 +192,7 @@ impl Ironbar {
                 while let Ok(event) = rx_outputs.recv().await {
                     match event.event_type {
                         OutputEventType::New => {
-                            match load_output_bars(&instance, &app, event.output) {
+                            match load_output_bars(&instance, &app, &event.output) {
                                 Ok(mut new_bars) => {
                                     instance.bars.borrow_mut().append(&mut new_bars);
                                 }
@@ -316,7 +316,7 @@ fn get_display() -> Display {
 fn load_output_bars(
     ironbar: &Rc<Ironbar>,
     app: &Application,
-    output: OutputInfo,
+    output: &OutputInfo,
 ) -> Result<Vec<Bar>> {
     let Some(monitor_name) = &output.name else {
         return Err(Report::msg("Output missing monitor name"));
diff --git a/src/modules/custom/mod.rs b/src/modules/custom/mod.rs
index 440c8e9..d1a099a 100644
--- a/src/modules/custom/mod.rs
+++ b/src/modules/custom/mod.rs
@@ -243,7 +243,7 @@ impl Module<gtk::Box> for CustomModule {
         context.button_id = popup_buttons
             .borrow()
             .first()
-            .map_or(usize::MAX, |button| button.popup_id());
+            .map_or(usize::MAX, PopupButton::popup_id);
 
         let popup = self
             .into_popup(
diff --git a/src/modules/notifications.rs b/src/modules/notifications.rs
index 6f8fea8..ecd0c9f 100644
--- a/src/modules/notifications.rs
+++ b/src/modules/notifications.rs
@@ -75,7 +75,7 @@ fn default_icon_open_dnd() -> String {
 }
 
 impl Icons {
-    fn icon(&self, value: &swaync::Event) -> &str {
+    fn icon(&self, value: swaync::Event) -> &str {
         match (value.cc_open, value.count > 0, value.dnd) {
             (true, _, true) => &self.open_dnd,
             (true, true, false) => &self.open_some,
@@ -172,7 +172,7 @@ impl Module<Overlay> for NotificationsModule {
             let button = button.clone();
 
             glib_recv!(context.subscribe(), ev => {
-                let icon = self.icons.icon(&ev);
+                let icon = self.icons.icon(ev);
                 button.set_label(icon);
 
                 label.set_label(&ev.count.to_string());
diff --git a/src/modules/tray/mod.rs b/src/modules/tray/mod.rs
index f677272..766f407 100644
--- a/src/modules/tray/mod.rs
+++ b/src/modules/tray/mod.rs
@@ -74,7 +74,7 @@ impl Module<MenuBar> for TrayModule {
 
         // listen to tray updates
         spawn(async move {
-            for (key, (item, menu)) in initial_items.into_iter() {
+            for (key, (item, menu)) in initial_items {
                 send_async!(
                     tx,
                     ModuleUpdateEvent::Update(Event::Add(key.clone(), item.into()))
@@ -89,7 +89,7 @@ impl Module<MenuBar> for TrayModule {
             }
 
             while let Ok(message) = tray_rx.recv().await {
-                send_async!(tx, ModuleUpdateEvent::Update(message))
+                send_async!(tx, ModuleUpdateEvent::Update(message));
             }
         });
 
@@ -159,12 +159,11 @@ fn on_update(
             let mut menu_item = TrayMenu::new(tx.clone(), address.clone(), *item);
             container.add(&menu_item.widget);
 
-            match icon::get_image(&menu_item, icon_theme, icon_size, prefer_icons) {
-                Ok(image) => menu_item.set_image(&image),
-                Err(_) => {
-                    let label = menu_item.title.clone().unwrap_or(address.clone());
-                    menu_item.set_label(&label)
-                }
+            if let Ok(image) = icon::get_image(&menu_item, icon_theme, icon_size, prefer_icons) {
+                menu_item.set_image(&image);
+            } else {
+                let label = menu_item.title.clone().unwrap_or(address.clone());
+                menu_item.set_label(&label);
             };
 
             menu_item.widget.show();