refactor: replace deprecated indexmap method

JakeStanger · Feb 2, 2024 · f3687c5 · f3687c5
1 parent 4934f2c
commit f3687c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/modules/launcher/item.rs b/src/modules/launcher/item.rs
@@ -52,7 +52,7 @@ impl Item {
     }
 
     pub fn unmerge_toplevel(&mut self, info: &ToplevelInfo) {
-        self.windows.remove(&info.id);
+        self.windows.shift_remove(&info.id);
         self.recalculate_open_state();
     }
 

diff --git a/src/modules/launcher/mod.rs b/src/modules/launcher/mod.rs
@@ -204,7 +204,7 @@ impl Module<gtk::Box> for LauncherModule {
                                     item.unmerge_toplevel(&info);
 
                                     if item.windows.is_empty() {
-                                        items.remove(&info.app_id);
+                                        items.shift_remove(&info.app_id);
                                         Some(ItemOrWindowId::Item)
                                     } else {
                                         Some(ItemOrWindowId::Window)
@@ -364,7 +364,7 @@ impl Module<gtk::Box> for LauncherModule {
                                 }
                             } else {
                                 container.remove(&button.button);
-                                buttons.remove(&app_id);
+                                buttons.shift_remove(&app_id);
                             }
                         }
                     }
@@ -483,7 +483,7 @@ impl Module<gtk::Box> for LauncherModule {
                         debug!("Removing window from popup for '{app_id}': {win_id}");
 
                         if let Some(buttons) = buttons.get_mut(&app_id) {
-                            buttons.remove(&win_id);
+                            buttons.shift_remove(&win_id);
                         }
                     }
                     LauncherUpdate::Title(app_id, win_id, title) => {