Fix clippy lints

iced-rs · Nov 29, 2023 · 7def3ee · 7def3ee
1 parent 9b34b2a
commit 7def3ee
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/runtime/src/multi_window/state.rs b/runtime/src/multi_window/state.rs
@@ -228,7 +228,7 @@ where
                 match operation.finish() {
                     operation::Outcome::None => {}
                     operation::Outcome::Some(message) => {
-                        self.queued_messages.push(message)
+                        self.queued_messages.push(message);
                     }
                     operation::Outcome::Chain(next) => {
                         current_operation = Some(next);

diff --git a/winit/src/application.rs b/winit/src/application.rs
@@ -720,9 +720,10 @@ pub fn run_command<A, C, E>(
                     let _res = window.drag_window();
                 }
                 window::Action::Spawn { .. } => {
-                    log::info!(
-                        "Spawning a window is only available with multi-window applications."
-                    )
+                    log::warn!(
+                        "Spawning a window is only available with \
+                        multi-window applications."
+                    );
                 }
                 window::Action::Resize(size) => {
                     window.set_inner_size(winit::dpi::LogicalSize {

diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs
@@ -912,7 +912,7 @@ pub fn run_command<A, C, E>(
                             size.width,
                             size.height,
                         ))))
-                        .expect("Send message to event loop")
+                        .expect("Send message to event loop");
                 }
                 window::Action::Maximize(maximized) => {
                     windows.with_raw(id).set_maximized(maximized);
@@ -934,7 +934,9 @@ pub fn run_command<A, C, E>(
                     ));
                 }
                 window::Action::ChangeIcon(icon) => {
-                    windows.with_raw(id).set_window_icon(conversion::icon(icon))
+                    windows
+                        .with_raw(id)
+                        .set_window_icon(conversion::icon(icon));
                 }
                 window::Action::FetchMode(tag) => {
                     let window = windows.with_raw(id);
@@ -969,12 +971,14 @@ pub fn run_command<A, C, E>(
                         .with_raw(id)
                         .set_window_level(conversion::window_level(level));
                 }
-                window::Action::FetchId(tag) => proxy
-                    .send_event(Event::Application(tag(windows
-                        .with_raw(id)
-                        .id()
-                        .into())))
-                    .expect("Event loop doesn't exist."),
+                window::Action::FetchId(tag) => {
+                    proxy
+                        .send_event(Event::Application(tag(windows
+                            .with_raw(id)
+                            .id()
+                            .into())))
+                        .expect("Event loop doesn't exist.");
+                }
                 window::Action::Screenshot(tag) => {
                     let i = windows.index_from_id(id);
                     let state = &windows.states[i];
@@ -996,7 +1000,7 @@ pub fn run_command<A, C, E>(
                                 state.physical_size(),
                             ),
                         )))
-                        .expect("Event loop doesn't exist.")
+                        .expect("Event loop doesn't exist.");
                 }
             },
             command::Action::System(action) => match action {
@@ -1014,7 +1018,7 @@ pub fn run_command<A, C, E>(
 
                             proxy
                                 .send_event(Event::Application(message))
-                                .expect("Event loop doesn't exist.")
+                                .expect("Event loop doesn't exist.");
                         });
                     }
                 }

diff --git a/winit/src/multi_window/windows.rs b/winit/src/multi_window/windows.rs
@@ -1,10 +1,12 @@
 use crate::core::{window, Size};
+use crate::graphics::Compositor;
 use crate::multi_window::{Application, State};
-use iced_graphics::Compositor;
-use iced_style::application::StyleSheet;
-use std::fmt::{Debug, Formatter};
+use crate::style::application::StyleSheet;
+
 use winit::monitor::MonitorHandle;
 
+use std::fmt::{Debug, Formatter};
+
 pub struct Windows<A: Application, C: Compositor>
 where
     <A::Renderer as crate::core::Renderer>::Theme: StyleSheet,
@@ -33,7 +35,7 @@ where
                 &self
                     .raw
                     .iter()
-                    .map(|raw| raw.id())
+                    .map(winit::window::Window::id)
                     .collect::<Vec<winit::window::WindowId>>(),
             )
             .field("states", &self.states)
@@ -131,7 +133,9 @@ where
     }
 
     pub fn last_monitor(&self) -> Option<MonitorHandle> {
-        self.raw.last().and_then(|w| w.current_monitor())
+        self.raw
+            .last()
+            .and_then(winit::window::Window::current_monitor)
     }
 
     pub fn last(&self) -> usize {