cargo fmt

src/core.rs

@@ -158,7 +158,7 @@ impl Default for Core {
             exit_on_main_window_closed: true,
             menu_bars: HashMap::new(),
             #[cfg(feature = "wayland")]
-            sync_window_border_radii_to_theme: true
+            sync_window_border_radii_to_theme: true,
         }
     }
 }

src/surface/action.rs

@@ -30,10 +30,7 @@ pub fn destroy_window(id: iced_core::window::Id) -> Action {
 #[cfg(all(feature = "wayland", feature = "winit"))]
 #[must_use]
 pub fn app_window<App: Application>(
-    settings: impl Fn(&mut App) -> window::Settings
+    settings: impl Fn(&mut App) -> window::Settings + Send + Sync + 'static,
-        + Send
-        + Sync
-        + 'static,
     view: Option<
         Box<
             dyn for<'a> Fn(&'a App) -> crate::Element<'a, crate::Action<App::Message>>
@@ -45,12 +42,8 @@ pub fn app_window<App: Application>(
 ) -> (window::Id, Action) {
     let id = window::Id::unique();
 
-    let boxed: Box<
+    let boxed: Box<dyn Fn(&mut App) -> window::Settings + Send + Sync + 'static> =
-        dyn Fn(&mut App) -> window::Settings
+        Box::new(settings);
-            + Send
-            + Sync
-            + 'static,
-    > = Box::new(settings);
     let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed);
 
     (
@@ -62,7 +55,7 @@ pub fn app_window<App: Application>(
                 let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(view);
                 Arc::new(boxed)
             }),
-        )
+        ),
     )
 }
 
@@ -70,22 +63,14 @@ pub fn app_window<App: Application>(
 #[cfg(all(feature = "wayland", feature = "winit"))]
 #[must_use]
 pub fn simple_window<Message: 'static>(
-    settings: impl Fn() -> window::Settings
+    settings: impl Fn() -> window::Settings + Send + Sync + 'static,
-        + Send
-        + Sync
-        + 'static,
     view: Option<
         impl Fn() -> crate::Element<'static, crate::Action<Message>> + Send + Sync + 'static,
     >,
 ) -> (window::Id, Action) {
     let id = window::Id::unique();
 
-    let boxed: Box<
+    let boxed: Box<dyn Fn() -> window::Settings + Send + Sync + 'static> = Box::new(settings);
-        dyn Fn() -> window::Settings
-            + Send
-            + Sync
-            + 'static,
-    > = Box::new(settings);
     let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed);
 
     (
@@ -95,16 +80,18 @@ pub fn simple_window<Message: 'static>(
             Arc::new(boxed),
             view.map(|view| {
                 let boxed: Box<
-                    dyn Fn() -> crate::Element<'static, crate::Action<Message>> + Send + Sync + 'static,
+                    dyn Fn() -> crate::Element<'static, crate::Action<Message>>
+                        + Send
+                        + Sync
+                        + 'static,
                 > = Box::new(view);
                 let boxed: Box<dyn Any + Send + Sync + 'static> = Box::new(boxed);
                 Arc::new(boxed)
             }),
-        )
+        ),
     )
 }
 
-
 #[cfg(all(feature = "wayland", feature = "winit"))]
 #[must_use]
 pub fn app_popup<App: Application>(

src/surface/mod.rs

@@ -96,15 +96,19 @@ impl std::fmt::Debug for Action {
                 .field("size", size)
                 .finish(),
             Self::Ignore => write!(f, "Ignore"),
-            Self::AppWindow(id, arg0, arg1) => {
+            Self::AppWindow(id, arg0, arg1) => f
-                f.debug_tuple("AppWindow").field(id).field(arg0).field(arg1).finish()
+                .debug_tuple("AppWindow")
-            }
+                .field(id)
-            Self::Window(id, arg0, arg1) => {
+                .field(arg0)
-                f.debug_tuple("Window").field(id).field(arg0).field(arg1).finish()
+                .field(arg1)
-            }
+                .finish(),
-            Self::DestroyWindow(arg0) => {
+            Self::Window(id, arg0, arg1) => f
-                f.debug_tuple("DestroyWindow").field(arg0).finish()
+                .debug_tuple("Window")
-            }
+                .field(id)
+                .field(arg0)
+                .field(arg1)
+                .finish(),
+            Self::DestroyWindow(arg0) => f.debug_tuple("DestroyWindow").field(arg0).finish(),
             Self::Task(_) => f.debug_tuple("Future").finish(),
         }
     }