From 31ea71deef7d79b277f0d7f028097d018ddc52d1 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <michael@mmurphy.dev>
Date: Mon, 20 May 2024 00:50:17 +0200
Subject: [PATCH] refactor(menu): remove redundant entity argument on
 MenuActions

---
 src/widget/menu/action.rs    | 8 ++------
 src/widget/menu/menu_tree.rs | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/widget/menu/action.rs b/src/widget/menu/action.rs
index 94da8639..25ac538f 100644
--- a/src/widget/menu/action.rs
+++ b/src/widget/menu/action.rs
@@ -31,7 +31,7 @@ use crate::widget::segmented_button::Entity;
 /// impl MenuAction for MyAction {
 ///     type Message = MyMessage;
 ///
-///     fn message(&self, entity: Option<Entity>) -> Self::Message {
+///     fn message(&self) -> Self::Message {
 ///         match self {
 ///             MyAction::Open => MyMessage::Open,
 ///             MyAction::Save => MyMessage::Save,
@@ -46,12 +46,8 @@ pub trait MenuAction: Clone + Copy + Eq + PartialEq {
 
     /// Returns a message of type `Self::Message` when the action is triggered.
     ///
-    /// # Arguments
-    ///
-    /// * `entity` - An optional `Entity` that may be associated with the action.
-    ///
     /// # Returns
     ///
     /// * `Self::Message` - The message that is produced when the action is triggered.
-    fn message(&self, entity: Option<Entity>) -> Self::Message;
+    fn message(&self) -> Self::Message;
 }
diff --git a/src/widget/menu/menu_tree.rs b/src/widget/menu/menu_tree.rs
index 51870c92..56715f7e 100644
--- a/src/widget/menu/menu_tree.rs
+++ b/src/widget/menu/menu_tree.rs
@@ -225,7 +225,7 @@ where
     Element<'a, Message, crate::Theme, Renderer>: From<widget::button::Button<'a, Message>>,
 {
     fn find_key<A: MenuAction>(action: &A, key_binds: &HashMap<KeyBind, A>) -> String {
-        for (key_bind, key_action) in key_binds.iter() {
+        for (key_bind, key_action) in key_binds {
             if action == key_action {
                 return key_bind.to_string();
             }
@@ -248,12 +248,12 @@ where
                         widget::horizontal_space(Length::Fill),
                         widget::text(key),
                     )
-                    .on_press(action.message(None));
+                    .on_press(action.message());
 
                     trees.push(MenuTree::<Message, Renderer>::new(menu_button));
                 }
                 MenuItem::CheckBox(label, value, action) => {
-                    let key = find_key(&action, &key_binds);
+                    let key = find_key(&action, key_binds);
                     trees.push(MenuTree::new(
                         menu_button!(
                             if value {
@@ -267,7 +267,7 @@ where
                             widget::horizontal_space(Length::Fill),
                             widget::text(key)
                         )
-                        .on_press(action.message(None)),
+                        .on_press(action.message()),
                     ));
                 }
                 MenuItem::Folder(label, children) => {