Cleanup not needed usages of Arc<Mutex>>

project-gauntlet · Jan 16, 2025 · 3201c72 · 3201c72
1 parent e4df96c
commit 3201c72
Show file tree

Hide file tree

Showing 5 changed files with 173 additions and 168 deletions.
diff --git a/rust/client/src/ui/client_context.rs b/rust/client/src/ui/client_context.rs
@@ -106,26 +106,26 @@ impl ClientContext {
         }
     }
 
-    pub fn handle_event(&self, render_location: UiRenderLocation, plugin_id: &PluginId, event: ComponentWidgetEvent) -> Option<UiViewEvent> {
+    pub fn handle_event(&mut self, render_location: UiRenderLocation, plugin_id: &PluginId, event: ComponentWidgetEvent) -> Option<UiViewEvent> {
         match render_location {
-            UiRenderLocation::InlineView => self.get_inline_view_container(&plugin_id).handle_event(plugin_id.clone(), event),
-            UiRenderLocation::View => self.get_view_container().handle_event(plugin_id.clone(), event)
+            UiRenderLocation::InlineView => self.get_mut_inline_view_container(&plugin_id).handle_event(plugin_id.clone(), event),
+            UiRenderLocation::View => self.get_mut_view_container().handle_event(plugin_id.clone(), event)
         }
     }
 
-    pub fn append_text(&self, text: &str) -> Task<AppMsg> {
+    pub fn append_text(&mut self, text: &str) -> Task<AppMsg> {
         self.view.append_text(text)
     }
 
-    pub fn backspace_text(&self) -> Task<AppMsg> {
+    pub fn backspace_text(&mut self) -> Task<AppMsg> {
         self.view.backspace_text()
     }
 
     pub fn focus_search_bar(&self, widget_id: UiWidgetId) -> Task<AppMsg> {
         self.view.focus_search_bar(widget_id)
     }
 
-    pub fn toggle_action_panel(&self) {
+    pub fn toggle_action_panel(&mut self) {
         self.view.toggle_action_panel()
     }
 
@@ -137,19 +137,19 @@ impl ClientContext {
         self.view.get_focused_item_id()
     }
 
-    pub fn focus_up(&self) -> Task<AppMsg> {
+    pub fn focus_up(&mut self) -> Task<AppMsg> {
         self.view.focus_up()
     }
 
-    pub fn focus_down(&self) -> Task<AppMsg> {
+    pub fn focus_down(&mut self) -> Task<AppMsg> {
         self.view.focus_down()
     }
 
-    pub fn focus_left(&self) -> Task<AppMsg> {
+    pub fn focus_left(&mut self) -> Task<AppMsg> {
         self.view.focus_left()
     }
 
-    pub fn focus_right(&self) -> Task<AppMsg> {
+    pub fn focus_right(&mut self) -> Task<AppMsg> {
         self.view.focus_right()
     }
 }
diff --git a/rust/client/src/ui/mod.rs b/rust/client/src/ui/mod.rs
@@ -823,10 +823,10 @@ fn update(state: &mut AppModel, message: AppMsg) -> Task<AppMsg> {
                 keyboard::Event::KeyPressed { key, modifiers, physical_key, text, .. } => {
                     tracing::debug!("Key pressed: {:?}. shift: {:?} control: {:?} alt: {:?} meta: {:?}", key, modifiers.shift(), modifiers.control(), modifiers.alt(), modifiers.logo());
                     match key {
-                        Key::Named(Named::ArrowUp) => state.global_state.up(&state.client_context, &state.search_results),
-                        Key::Named(Named::ArrowDown) => state.global_state.down(&state.client_context, &state.search_results),
-                        Key::Named(Named::ArrowLeft) => state.global_state.left(&state.client_context, &state.search_results),
-                        Key::Named(Named::ArrowRight) => state.global_state.right(&state.client_context, &state.search_results),
+                        Key::Named(Named::ArrowUp) => state.global_state.up(&mut state.client_context, &state.search_results),
+                        Key::Named(Named::ArrowDown) => state.global_state.down(&mut state.client_context, &state.search_results),
+                        Key::Named(Named::ArrowLeft) => state.global_state.left(&mut state.client_context, &state.search_results),
+                        Key::Named(Named::ArrowRight) => state.global_state.right(&mut state.client_context, &state.search_results),
                         Key::Named(Named::Escape) => state.global_state.back(&state.client_context),
                         Key::Named(Named::Tab) if !modifiers.shift() => state.global_state.next(&state.client_context),
                         Key::Named(Named::Tab) if modifiers.shift() => state.global_state.previous(&state.client_context),
@@ -2164,7 +2164,7 @@ impl AppModel {
         }, |result| handle_backend_error(result, |()| AppMsg::Noop))
     }
 
-    fn handle_plugin_event(&self, widget_event: ComponentWidgetEvent, plugin_id: PluginId, render_location: UiRenderLocation) -> Task<AppMsg> {
+    fn handle_plugin_event(&mut self, widget_event: ComponentWidgetEvent, plugin_id: PluginId, render_location: UiRenderLocation) -> Task<AppMsg> {
         let mut backend_client = self.backend_api.clone();
 
         let event = self.client_context.handle_event(render_location, &plugin_id, widget_event.clone());

diff --git a/rust/client/src/ui/state/mod.rs b/rust/client/src/ui/state/mod.rs
@@ -124,10 +124,10 @@ pub trait Focus<T> {
     fn back(&mut self, client_context: &ClientContext) -> Task<AppMsg>;
     fn next(&mut self, client_context: &ClientContext) -> Task<AppMsg>;
     fn previous(&mut self, client_context: &ClientContext) -> Task<AppMsg>;
-    fn up(&mut self, client_context: &ClientContext, focus_list: &[T]) -> Task<AppMsg>;
-    fn down(&mut self, client_context: &ClientContext, focus_list: &[T]) -> Task<AppMsg>;
-    fn left(&mut self, client_context: &ClientContext, focus_list: &[T]) -> Task<AppMsg>;
-    fn right(&mut self, client_context: &ClientContext, focus_list: &[T]) -> Task<AppMsg>;
+    fn up(&mut self, client_context: &mut ClientContext, focus_list: &[T]) -> Task<AppMsg>;
+    fn down(&mut self, client_context: &mut ClientContext, focus_list: &[T]) -> Task<AppMsg>;
+    fn left(&mut self, client_context: &mut ClientContext, focus_list: &[T]) -> Task<AppMsg>;
+    fn right(&mut self, client_context: &mut ClientContext, focus_list: &[T]) -> Task<AppMsg>;
 }
 
 impl Focus<SearchResult> for GlobalState {
@@ -300,7 +300,7 @@ impl Focus<SearchResult> for GlobalState {
             GlobalState::ErrorView { .. } => Task::none(),
         }
     }
-    fn up(&mut self, client_context: &ClientContext, _focus_list: &[SearchResult]) -> Task<AppMsg> {
+    fn up(&mut self, client_context: &mut ClientContext, _focus_list: &[SearchResult]) -> Task<AppMsg> {
         match self {
             GlobalState::MainView { focused_search_result, sub_state, .. } => {
                 match sub_state {
@@ -332,7 +332,7 @@ impl Focus<SearchResult> for GlobalState {
             },
         }
     }
-    fn down(&mut self, client_context: &ClientContext, focus_list: &[SearchResult]) -> Task<AppMsg> {
+    fn down(&mut self, client_context: &mut ClientContext, focus_list: &[SearchResult]) -> Task<AppMsg> {
         match self {
             GlobalState::MainView { focused_search_result, sub_state, .. } => {
                 match sub_state {
@@ -391,7 +391,7 @@ impl Focus<SearchResult> for GlobalState {
             }
         }
     }
-    fn left(&mut self, client_context: &ClientContext, _focus_list: &[SearchResult]) -> Task<AppMsg> {
+    fn left(&mut self, client_context: &mut ClientContext, _focus_list: &[SearchResult]) -> Task<AppMsg> {
         match self {
             GlobalState::PluginView { sub_state, .. } => {
                 match sub_state {
@@ -405,7 +405,7 @@ impl Focus<SearchResult> for GlobalState {
             GlobalState::ErrorView { .. } => Task::none(),
         }
     }
-    fn right(&mut self, client_context: &ClientContext, _focus_list: &[SearchResult]) -> Task<AppMsg> {
+    fn right(&mut self, client_context: &mut ClientContext, _focus_list: &[SearchResult]) -> Task<AppMsg> {
         match self {
             GlobalState::PluginView { sub_state, .. } => {
                 match sub_state {