cleanup: formatting and clippy

examples/integration/src/controls.rs

@@ -46,7 +46,7 @@ impl Program for Controls {
         Command::none()
     }
 
-    fn view(&self, _: Id) -> Element<Message, Renderer<Theme>> {
+    fn view(&self) -> Element<Message, Renderer<Theme>> {
         let background_color = self.background_color;
         let text = &self.text;
 

examples/integration/src/main.rs

@@ -154,7 +154,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     let mut state = program::State::new(
-        Id(0),
+        Id::MAIN,
         controls,
         viewport.logical_size(),
         &mut renderer,
@@ -199,7 +199,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
                 if !state.is_queue_empty() {
                     // We update iced
                     let _ = state.update(
-                        Id(0),
+                        Id::MAIN,
                         viewport.logical_size(),
                         cursor_position
                             .map(|p| {

examples/sctk_todos/src/main.rs

@@ -1,11 +1,8 @@
 use env_logger::Env;
 use iced::alignment::{self, Alignment};
 use iced::event::{self, listen_raw, Event};
-use iced::subscription;
 use iced::theme::{self, Theme};
-use iced::wayland::actions::data_device::ActionInner;
 use iced::wayland::actions::window::SctkWindowSettings;
-use iced::wayland::data_device::action as data_device_action;
 use iced::wayland::InitialSurface;
 use iced::widget::{
     self, button, checkbox, column, container, row, scrollable, text,
@@ -20,7 +17,6 @@ use iced_core::{id, keyboard};
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
-use std::sync::Arc;
 
 static INPUT_ID: Lazy<Id> = Lazy::new(Id::unique);
 

runtime/src/program/state.rs

@@ -275,7 +275,7 @@ where
 }
 
 fn build_user_interface<'a, P: Program>(
-    id: crate::window::Id,
+    _id: crate::window::Id,
     program: &'a mut P,
     cache: user_interface::Cache,
     renderer: &mut P::Renderer,

src/application.rs

@@ -1,5 +1,4 @@
 //! Build interactive cross-platform applications.
-use iced_core::window::Id;
 
 use crate::{Command, Element, Executor, Settings, Subscription};
 

src/wayland/mod.rs

@@ -60,7 +60,7 @@ pub trait Application: Sized {
     /// Returns the current [`Theme`] of the [`Application`].
     ///
     /// [`Theme`]: Self::Theme
-    fn theme(&self, id: Id) -> Self::Theme {
+    fn theme(&self, _id: Id) -> Self::Theme {
         Self::Theme::default()
     }
 
@@ -98,7 +98,7 @@ pub trait Application: Sized {
     /// while a scale factor of `0.5` will shrink them to half their size.
     ///
     /// By default, it returns `1.0`.
-    fn scale_factor(&self, id: Id) -> f64 {
+    fn scale_factor(&self, _id: Id) -> f64 {
         1.0
     }
 

src/wayland/sandbox.rs

@@ -81,10 +81,6 @@ use crate::{
 ///     fn view(&self, _: Id) -> Element<Self::Message> {
 ///         "Hello, world!".into()
 ///     }
-///
-///     fn close_requested(&self, _: Id) -> Self::Message {
-///         unimplemented!()
-///     }
 /// }
 /// ```
 pub trait Sandbox {

tiny_skia/src/window/compositor.rs

@@ -183,10 +183,10 @@ pub fn present<T: AsRef<str>>(
     surface
         .window
         .resize(
-            NonZeroU32::new(physical_size.width as u32)
-                .ok_or_else(|| compositor::SurfaceError::InvalidDimensions)?,
-            NonZeroU32::new(physical_size.height as u32)
-                .ok_or_else(|| compositor::SurfaceError::InvalidDimensions)?,
+            NonZeroU32::new(physical_size.width)
+                .ok_or(compositor::SurfaceError::InvalidDimensions)?,
+            NonZeroU32::new(physical_size.height)
+                .ok_or(compositor::SurfaceError::InvalidDimensions)?,
         )
         .map_err(|_| compositor::SurfaceError::Resize)?;
     if let Ok(mut b) = surface.window.buffer_mut() {

winit/src/application.rs

@@ -1,7 +1,5 @@
 //! Create interactive, native cross-platform applications.
 mod drag_resize;
-#[cfg(feature = "trace")]
-mod profiler;
 mod state;
 
 #[cfg(feature = "a11y")]
@@ -918,14 +916,10 @@ pub fn run_command<A, C, E>(
     for action in command.actions() {
         match action {
             command::Action::Future(future) => {
-                runtime.spawn(Box::pin(
-                    future.map(|e| UserEventWrapper::Message(e)),
-                ));
+                runtime.spawn(Box::pin(future.map(UserEventWrapper::Message)));
             }
             command::Action::Stream(stream) => {
-                runtime.run(Box::pin(
-                    stream.map(|e| UserEventWrapper::Message(e)),
-                ));
+                runtime.run(Box::pin(stream.map(UserEventWrapper::Message)));
             }
             command::Action::Clipboard(action) => match action {
                 clipboard::Action::Read(tag) => {

winit/src/conversion.rs

@@ -160,9 +160,6 @@ pub fn window_event(
         WindowEvent::CloseRequested => {
             Some(Event::Window(id, window::Event::CloseRequested))
         }
-        WindowEvent::CloseRequested => {
-            Some(Event::Window(id, window::Event::CloseRequested))
-        }
         WindowEvent::CursorMoved { position, .. } => {
             let position = position.to_logical::<f64>(scale_factor);
 

winit/src/multi_window.rs

@@ -965,14 +965,10 @@ fn run_command<A, C, E>(
     for action in command.actions() {
         match action {
             command::Action::Future(future) => {
-                runtime.spawn(Box::pin(
-                    future.map(|e| UserEventWrapper::Message(e)),
-                ));
+                runtime.spawn(Box::pin(future.map(UserEventWrapper::Message)));
             }
             command::Action::Stream(stream) => {
-                runtime.run(Box::pin(
-                    stream.map(|e| UserEventWrapper::Message(e)),
-                ));
+                runtime.run(Box::pin(stream.map(UserEventWrapper::Message)));
             }
             command::Action::Clipboard(action) => match action {
                 clipboard::Action::Read(tag) => {