Fix clippy lints

iced-rs · Dec 2, 2023 · 32dcf5f · 32dcf5f
1 parent 277b8ea
commit 32dcf5f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs
@@ -6,7 +6,6 @@ pub use state::State;
 
 use crate::conversion;
 use crate::core;
-use crate::core::mouse;
 use crate::core::renderer;
 use crate::core::widget::operation;
 use crate::core::window;

diff --git a/winit/src/multi_window/window_manager.rs b/winit/src/multi_window/window_manager.rs
@@ -96,10 +96,22 @@ where
         self.entries.values().last()?.raw.current_monitor()
     }
 
-    pub fn remove(&mut self, id: Id) {
-        if let Some(window) = self.entries.remove(&id) {
-            let _ = self.aliases.remove(&window.raw.id());
-        }
+    pub fn remove(&mut self, id: Id) -> Option<Window<A, C>> {
+        let window = self.entries.remove(&id)?;
+        let _ = self.aliases.remove(&window.raw.id());
+
+        Some(window)
+    }
+}
+
+impl<A, C> Default for WindowManager<A, C>
+where
+    A: Application,
+    C: Compositor<Renderer = A::Renderer>,
+    <A::Renderer as crate::core::Renderer>::Theme: StyleSheet,
+{
+    fn default() -> Self {
+        Self::new()
     }
 }