chore: format for Rust 2024

src/shell/focus/mod.rs

@@ -1,16 +1,16 @@
 use crate::{
-    shell::{element::CosmicMapped, CosmicSurface, MinimizedWindow, Shell},
+    shell::{CosmicSurface, MinimizedWindow, Shell, element::CosmicMapped},
     state::Common,
     utils::prelude::*,
     wayland::handlers::{xdg_shell::PopupGrabData, xwayland_keyboard_grab::XWaylandGrabSeatData},
 };
 use indexmap::IndexSet;
 use smithay::{
-    desktop::{layer_map_for_output, PopupUngrabStrategy},
-    input::{pointer::MotionEvent, Seat},
+    desktop::{PopupUngrabStrategy, layer_map_for_output},
+    input::{Seat, pointer::MotionEvent},
     output::Output,
-    reexports::wayland_server::{protocol::wl_surface::WlSurface, Resource},
-    utils::{IsAlive, Point, Serial, SERIAL_COUNTER},
+    reexports::wayland_server::{Resource, protocol::wl_surface::WlSurface},
+    utils::{IsAlive, Point, SERIAL_COUNTER, Serial},
     wayland::{
         seat::WaylandFocus,
         selection::{data_device::set_data_device_focus, primary_selection::set_primary_focus},
@@ -21,10 +21,10 @@ use std::{borrow::Cow, mem, sync::Mutex};
 
 use tracing::{debug, trace};
 
-pub use self::order::{render_input_order, Stage};
+pub use self::order::{Stage, render_input_order};
 use self::target::{KeyboardFocusTarget, WindowGroup};
 
-use super::{grabs::SeatMoveGrabState, layout::floating::FloatingLayout, SeatExt};
+use super::{SeatExt, grabs::SeatMoveGrabState, layout::floating::FloatingLayout};
 
 mod order;
 pub mod target;

src/shell/focus/order.rs

@@ -3,7 +3,7 @@ use std::{ops::ControlFlow, time::Instant};
 use cosmic_comp_config::workspace::WorkspaceLayout;
 use keyframe::{ease, functions::EaseInOutCubic};
 use smithay::{
-    desktop::{layer_map_for_output, LayerSurface, PopupKind, PopupManager},
+    desktop::{LayerSurface, PopupKind, PopupManager, layer_map_for_output},
     output::{Output, OutputNoMode},
     utils::{Logical, Point},
     wayland::{session_lock::LockSurface, shell::wlr_layer::Layer},
@@ -13,14 +13,14 @@ use smithay::{
 use crate::{
     backend::render::ElementFilter,
     shell::{
+        SeatExt, Shell, Workspace, WorkspaceDelta,
         focus::target::KeyboardFocusTarget,
         layout::{floating::FloatingLayout, tiling::ANIMATION_DURATION},
-        SeatExt, Shell, Workspace, WorkspaceDelta,
     },
     utils::{
         geometry::*,
         prelude::OutputExt,
-        quirks::{workspace_overview_is_open, WORKSPACE_OVERVIEW_NAMESPACE},
+        quirks::{WORKSPACE_OVERVIEW_NAMESPACE, workspace_overview_is_open},
     },
     wayland::protocols::workspace::WorkspaceHandle,
 };

src/shell/focus/target.rs

@@ -2,10 +2,10 @@ use std::{borrow::Cow, sync::Weak, time::Duration};
 
 use crate::{
     shell::{
+        CosmicSurface, SeatExt,
         element::{CosmicMapped, CosmicStack, CosmicWindow},
         layout::tiling::ResizeForkTarget,
         zoom::ZoomFocusTarget,
-        CosmicSurface, SeatExt,
     },
     utils::prelude::*,
     wayland::handlers::{screencopy::SessionHolder, xdg_shell::popup::get_popup_toplevel},
@@ -13,8 +13,9 @@ use crate::{
 use id_tree::NodeId;
 use smithay::{
     backend::input::KeyState,
-    desktop::{space::SpaceElement, LayerSurface, PopupKind, WindowSurface, WindowSurfaceType},
+    desktop::{LayerSurface, PopupKind, WindowSurface, WindowSurfaceType, space::SpaceElement},
     input::{
+        Seat,
         keyboard::{KeyboardTarget, KeysymHandle, ModifiersState},
         pointer::{
             AxisFrame, ButtonEvent, GestureHoldBeginEvent, GestureHoldEndEvent,
@@ -26,14 +27,13 @@ use smithay::{
             DownEvent, MotionEvent as TouchMotionEvent, OrientationEvent, ShapeEvent, TouchTarget,
             UpEvent,
         },
-        Seat,
     },
     reexports::wayland_server::{
-        backend::ObjectId, protocol::wl_surface::WlSurface, Client, Resource,
+        Client, Resource, backend::ObjectId, protocol::wl_surface::WlSurface,
     },
     utils::{IsAlive, Logical, Point, Serial, Transform},
     wayland::{seat::WaylandFocus, session_lock::LockSurface},
-    xwayland::{xwm::XwmId, X11Surface},
+    xwayland::{X11Surface, xwm::XwmId},
 };
 
 #[derive(Debug, Clone, PartialEq)]