all: set rust edition to 2024

src/it/test_backend.rs

@@ -263,7 +263,7 @@ where
             return Err(TestBackendError::OpenDrmNode(
                 node.as_os_str().as_bytes().as_bstr().to_string(),
                 e.into(),
-            ))
+            ));
         }
     };
     let drm = Drm::open_existing(file).map_err(TestBackendError::OpenDrmDevice)?;

src/it/test_client.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        cli::{screenshot::buf_to_bytes, ScreenshotFormat},
+        cli::{ScreenshotFormat, screenshot::buf_to_bytes},
         client::Client,
         globals::GlobalBase,
         it::{

src/it/test_config.rs

@@ -10,14 +10,13 @@ use {
     isnt::std_1::primitive::IsntConstPtrExt,
     jay_config::{
         _private::{
-            bincode_ops,
+            ConfigEntry, VERSION, bincode_ops,
             ipc::{ClientMessage, Response, ServerMessage},
-            ConfigEntry, VERSION,
         },
+        Axis, Direction,
         input::{InputDevice, Seat},
         keyboard::{Keymap, ModifiedKeySym},
         video::{Connector, Transform},
-        Axis, Direction,
     },
     std::{cell::Cell, ops::Deref, ptr, rc::Rc, time::Duration},
 };

src/it/test_gfx_api.rs

@@ -2,7 +2,7 @@ use {
     crate::{
         allocator::{Allocator, AllocatorError, BufferObject, BufferUsage},
         cpu_worker::CpuWorker,
-        format::{Format, ARGB8888, XRGB8888},
+        format::{ARGB8888, Format, XRGB8888},
         gfx_api::{
             AcquireSync, AsyncShmGfxTexture, AsyncShmGfxTextureCallback, CopyTexture, FillRect,
             FramebufferRect, GfxApiOpt, GfxContext, GfxError, GfxFormat, GfxFramebuffer, GfxImage,
@@ -11,7 +11,7 @@ use {
         },
         rect::{Rect, Region},
         theme::Color,
-        video::{dmabuf::DmaBuf, drm::sync_obj::SyncObjCtx, LINEAR_MODIFIER},
+        video::{LINEAR_MODIFIER, dmabuf::DmaBuf, drm::sync_obj::SyncObjCtx},
     },
     ahash::AHashMap,
     indexmap::IndexSet,

src/it/test_ifs/test_alpha_modifier.rs

@@ -8,7 +8,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{wp_alpha_modifier_v1::*, WpAlphaModifierV1Id},
+        wire::{WpAlphaModifierV1Id, wp_alpha_modifier_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_alpha_modifier_surface.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport},
-        wire::{wp_alpha_modifier_surface_v1::*, WpAlphaModifierSurfaceV1Id},
+        wire::{WpAlphaModifierSurfaceV1Id, wp_alpha_modifier_surface_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_buffer.rs

@@ -5,7 +5,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{wl_buffer::*, WlBufferId},
+        wire::{WlBufferId, wl_buffer::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_callback.rs

@@ -5,7 +5,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{wl_callback::*, WlCallbackId},
+        wire::{WlCallbackId, wl_callback::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_compositor.rs

@@ -7,8 +7,8 @@ use {
             test_transport::TestTransport,
         },
         wire::{
-            wl_compositor::{CreateRegion, CreateSurface},
             WlCompositorId,
+            wl_compositor::{CreateRegion, CreateSurface},
         },
     },
     std::{cell::Cell, rc::Rc},

src/it/test_ifs/test_content_type.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport},
-        wire::{wp_content_type_v1::*, WpContentTypeV1Id},
+        wire::{WpContentTypeV1Id, wp_content_type_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_content_type_manager.rs

@@ -6,7 +6,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{wp_content_type_manager_v1::*, WpContentTypeManagerV1Id},
+        wire::{WpContentTypeManagerV1Id, wp_content_type_manager_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_cursor_shape_device.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         it::{test_error::TestResult, test_object::TestObject, test_transport::TestTransport},
-        wire::{wp_cursor_shape_device_v1::*, WpCursorShapeDeviceV1Id},
+        wire::{WpCursorShapeDeviceV1Id, wp_cursor_shape_device_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_cursor_shape_manager.rs

@@ -8,7 +8,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{wp_cursor_shape_manager_v1::*, WpCursorShapeManagerV1Id},
+        wire::{WpCursorShapeManagerV1Id, wp_cursor_shape_manager_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_data_control_device.rs

@@ -13,7 +13,7 @@ use {
         },
         utils::{buffd::MsgParser, copyhashmap::CopyHashMap},
         wire::{
-            zwlr_data_control_device_v1::*, ZwlrDataControlDeviceV1Id, ZwlrDataControlOfferV1Id,
+            ZwlrDataControlDeviceV1Id, ZwlrDataControlOfferV1Id, zwlr_data_control_device_v1::*,
         },
     },
     std::{cell::Cell, rc::Rc},

src/it/test_ifs/test_data_control_manager.rs

@@ -9,7 +9,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{zwlr_data_control_manager_v1::*, ZwlrDataControlManagerV1Id},
+        wire::{ZwlrDataControlManagerV1Id, zwlr_data_control_manager_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_data_control_offer.rs

@@ -7,14 +7,14 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{zwlr_data_control_offer_v1::*, ZwlrDataControlOfferV1Id},
+        wire::{ZwlrDataControlOfferV1Id, zwlr_data_control_offer_v1::*},
     },
     ahash::AHashSet,
     std::{
         cell::{Cell, RefCell},
         rc::Rc,
     },
-    uapi::{c, OwnedFd},
+    uapi::{OwnedFd, c},
 };
 
 pub struct TestDataControlOffer {

src/it/test_ifs/test_data_control_source.rs

@@ -8,7 +8,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{zwlr_data_control_source_v1::*, ZwlrDataControlSourceV1Id},
+        wire::{ZwlrDataControlSourceV1Id, zwlr_data_control_source_v1::*},
     },
     std::{cell::Cell, rc::Rc},
     uapi::OwnedFd,

src/it/test_ifs/test_data_device.rs

@@ -11,7 +11,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{wl_data_device::*, WlDataDeviceId, WlSurfaceId},
+        wire::{WlDataDeviceId, WlSurfaceId, wl_data_device::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_data_device_manager.rs

@@ -9,7 +9,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{wl_data_device_manager::*, WlDataDeviceManagerId},
+        wire::{WlDataDeviceManagerId, wl_data_device_manager::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_data_offer.rs

@@ -5,7 +5,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{wl_data_offer::*, WlDataOfferId},
+        wire::{WlDataOfferId, wl_data_offer::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_data_source.rs

@@ -5,7 +5,7 @@ use {
             test_utils::test_expected_event::TEEH, testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{wl_data_source::*, WlDataSourceId},
+        wire::{WlDataSourceId, wl_data_source::*},
     },
     std::{cell::Cell, rc::Rc},
     uapi::OwnedFd,

src/it/test_ifs/test_display.rs

@@ -7,7 +7,7 @@ use {
         },
         object::ObjectId,
         utils::buffd::MsgParser,
-        wire::{wl_display::*, WlDisplayId},
+        wire::{WlDisplayId, wl_display::*},
     },
     std::rc::Rc,
 };

src/it/test_ifs/test_dmabuf.rs

@@ -6,7 +6,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{zwp_linux_dmabuf_v1::*, ZwpLinuxDmabufV1Id},
+        wire::{ZwpLinuxDmabufV1Id, zwp_linux_dmabuf_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_dmabuf_feedback.rs

@@ -5,7 +5,7 @@ use {
             test_utils::test_expected_event::TEEH, testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{zwp_linux_dmabuf_feedback_v1::*, ZwpLinuxDmabufFeedbackV1Id},
+        wire::{ZwpLinuxDmabufFeedbackV1Id, zwp_linux_dmabuf_feedback_v1::*},
     },
     std::{
         cell::{Cell, RefCell},
@@ -13,7 +13,7 @@ use {
         ops::DerefMut,
         rc::Rc,
     },
-    uapi::{c, OwnedFd},
+    uapi::{OwnedFd, c},
 };
 
 pub struct TestDmabufFeedback {

src/it/test_ifs/test_ext_foreign_toplevel_handle.rs

@@ -7,7 +7,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{ext_foreign_toplevel_handle_v1::*, ExtForeignToplevelHandleV1Id},
+        wire::{ExtForeignToplevelHandleV1Id, ext_foreign_toplevel_handle_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_ext_foreign_toplevel_list.rs

@@ -8,7 +8,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{ext_foreign_toplevel_list_v1::*, ExtForeignToplevelListV1Id},
+        wire::{ExtForeignToplevelListV1Id, ext_foreign_toplevel_list_v1::*},
     },
     std::{
         cell::{Cell, RefCell},

src/it/test_ifs/test_input_method.rs

@@ -12,7 +12,7 @@ use {
             testrun::ParseFull,
         },
         utils::{buffd::MsgParser, numcell::NumCell},
-        wire::{zwp_input_method_v2::*, ZwpInputMethodV2Id},
+        wire::{ZwpInputMethodV2Id, zwp_input_method_v2::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_input_method_keyboard_grab.rs

@@ -5,7 +5,7 @@ use {
             test_utils::test_expected_event::TEEH, testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{zwp_input_method_keyboard_grab_v2::*, ZwpInputMethodKeyboardGrabV2Id},
+        wire::{ZwpInputMethodKeyboardGrabV2Id, zwp_input_method_keyboard_grab_v2::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_input_method_manager.rs

@@ -6,7 +6,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{zwp_input_method_manager_v2::GetInputMethod, ZwpInputMethodManagerV2Id},
+        wire::{ZwpInputMethodManagerV2Id, zwp_input_method_manager_v2::GetInputMethod},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_input_popup_surface.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport},
-        wire::{zwp_input_popup_surface_v2::*, ZwpInputPopupSurfaceV2Id},
+        wire::{ZwpInputPopupSurfaceV2Id, zwp_input_popup_surface_v2::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_jay_compositor.rs

@@ -11,8 +11,8 @@ use {
         utils::{buffd::MsgParser, cell_ext::CellExt},
         video::dmabuf::DmaBuf,
         wire::{
-            jay_compositor::{self, *},
             JayCompositorId,
+            jay_compositor::{self, *},
         },
     },
     std::{cell::Cell, rc::Rc},

src/it/test_ifs/test_keyboard.rs

@@ -6,7 +6,7 @@ use {
             test_utils::test_expected_event::TEEH, testrun::ParseFull,
         },
         utils::{buffd::MsgParser, clonecell::CloneCell, numcell::NumCell, once::Once},
-        wire::{wl_keyboard::*, WlKeyboardId, WlSurfaceId},
+        wire::{WlKeyboardId, WlSurfaceId, wl_keyboard::*},
     },
     std::rc::Rc,
 };

src/it/test_ifs/test_pointer.rs

@@ -7,7 +7,7 @@ use {
             testrun::ParseFull,
         },
         utils::{buffd::MsgParser, clonecell::CloneCell},
-        wire::{wl_pointer::*, WlPointerId, WlSurfaceId},
+        wire::{WlPointerId, WlSurfaceId, wl_pointer::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_region.rs

@@ -3,7 +3,7 @@ use {
         ifs::wl_region::WlRegion,
         it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport},
         rect::{Rect, RegionBuilder},
-        wire::{wl_region::*, WlRegionId},
+        wire::{WlRegionId, wl_region::*},
     },
     std::{
         cell::{Cell, RefCell},

src/it/test_ifs/test_registry.rs

@@ -27,7 +27,7 @@ use {
             testrun::ParseFull,
         },
         utils::{buffd::MsgParser, clonecell::CloneCell, copyhashmap::CopyHashMap},
-        wire::{wl_registry::*, WlRegistryId, WlSeat},
+        wire::{WlRegistryId, WlSeat, wl_registry::*},
     },
     std::rc::Rc,
 };

src/it/test_ifs/test_screenshot.rs

@@ -5,7 +5,7 @@ use {
         state::State,
         utils::buffd::MsgParser,
         video::dmabuf::{DmaBuf, DmaBufPlane, PlaneVec},
-        wire::{jay_screenshot::*, JayScreenshotId},
+        wire::{JayScreenshotId, jay_screenshot::*},
     },
     std::{
         cell::{Cell, RefCell},

src/it/test_ifs/test_seat.rs

@@ -9,7 +9,7 @@ use {
             testrun::ParseFull,
         },
         utils::{buffd::MsgParser, clonecell::CloneCell, once::Once},
-        wire::{wl_seat::*, WlSeatId},
+        wire::{WlSeatId, wl_seat::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_shm.rs

@@ -10,7 +10,7 @@ use {
             testrun::ParseFull,
         },
         utils::{buffd::MsgParser, clonecell::CloneCell, copyhashmap::CopyHashMap},
-        wire::{wl_shm::*, WlShmId},
+        wire::{WlShmId, wl_shm::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_shm_pool.rs

@@ -9,7 +9,7 @@ use {
             test_transport::TestTransport,
         },
         utils::clonecell::CloneCell,
-        wire::{wl_shm_pool::*, WlShmPoolId},
+        wire::{WlShmPoolId, wl_shm_pool::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_single_pixel_buffer_manager.rs

@@ -5,7 +5,7 @@ use {
             test_transport::TestTransport,
         },
         theme::Color,
-        wire::{wp_single_pixel_buffer_manager_v1::*, WpSinglePixelBufferManagerV1Id},
+        wire::{WpSinglePixelBufferManagerV1Id, wp_single_pixel_buffer_manager_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_subcompositor.rs

@@ -4,7 +4,7 @@ use {
             test_error::TestError, test_ifs::test_subsurface::TestSubsurface,
             test_object::TestObject, test_transport::TestTransport,
         },
-        wire::{wl_subcompositor::*, WlSubcompositorId, WlSurfaceId},
+        wire::{WlSubcompositorId, WlSurfaceId, wl_subcompositor::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_subsurface.rs

@@ -2,7 +2,7 @@ use {
     crate::{
         ifs::wl_surface::wl_subsurface::WlSubsurface,
         it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport},
-        wire::{wl_subsurface::*, WlSubsurfaceId, WlSurfaceId},
+        wire::{WlSubsurfaceId, WlSurfaceId, wl_subsurface::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_surface.rs

@@ -10,7 +10,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{wl_surface::*, WlBufferId, WlSurfaceId},
+        wire::{WlBufferId, WlSurfaceId, wl_surface::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_syncobj_manager.rs

@@ -10,7 +10,7 @@ use {
             test_transport::TestTransport,
         },
         video::drm::sync_obj::SyncObj,
-        wire::{wp_linux_drm_syncobj_manager_v1::*, WpLinuxDrmSyncobjManagerV1Id},
+        wire::{WpLinuxDrmSyncobjManagerV1Id, wp_linux_drm_syncobj_manager_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_syncobj_surface.rs

@@ -4,7 +4,7 @@ use {
             test_error::TestResult, test_ifs::test_syncobj_timeline::TestSyncobjTimeline,
             test_object::TestObject, test_transport::TestTransport,
         },
-        wire::{wp_linux_drm_syncobj_surface_v1::*, WpLinuxDrmSyncobjSurfaceV1Id},
+        wire::{WpLinuxDrmSyncobjSurfaceV1Id, wp_linux_drm_syncobj_surface_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_syncobj_timeline.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport},
-        wire::{wp_linux_drm_syncobj_timeline_v1::*, WpLinuxDrmSyncobjTimelineV1Id},
+        wire::{WpLinuxDrmSyncobjTimelineV1Id, wp_linux_drm_syncobj_timeline_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_text_input.rs

@@ -8,7 +8,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{zwp_text_input_v3::*, ZwpTextInputV3Id},
+        wire::{ZwpTextInputV3Id, zwp_text_input_v3::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_text_input_manager.rs

@@ -6,7 +6,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{zwp_text_input_manager_v3::*, ZwpTextInputManagerV3Id},
+        wire::{ZwpTextInputManagerV3Id, zwp_text_input_manager_v3::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_toplevel_drag.rs

@@ -4,7 +4,7 @@ use {
             test_error::TestError, test_ifs::test_xdg_toplevel::TestXdgToplevel,
             test_object::TestObject, test_transport::TestTransport,
         },
-        wire::{xdg_toplevel_drag_v1::*, XdgToplevelDragV1Id},
+        wire::{XdgToplevelDragV1Id, xdg_toplevel_drag_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_toplevel_drag_manager.rs

@@ -6,7 +6,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{xdg_toplevel_drag_manager_v1::*, XdgToplevelDragManagerV1Id},
+        wire::{XdgToplevelDragManagerV1Id, xdg_toplevel_drag_manager_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_viewport.rs

@@ -2,7 +2,7 @@ use {
     crate::{
         fixed::Fixed,
         it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport},
-        wire::{wp_viewport::*, WpViewportId},
+        wire::{WpViewportId, wp_viewport::*},
     },
     std::rc::Rc,
 };

src/it/test_ifs/test_viewporter.rs

@@ -6,7 +6,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{wp_viewporter::*, WpViewporterId},
+        wire::{WpViewporterId, wp_viewporter::*},
     },
     std::rc::Rc,
 };

src/it/test_ifs/test_virtual_keyboard.rs

@@ -3,7 +3,7 @@ use {
         backend::KeyState,
         ifs::wl_seat::wl_keyboard,
         it::{test_error::TestError, test_object::TestObject, test_transport::TestTransport},
-        wire::{zwp_virtual_keyboard_v1::*, ZwpVirtualKeyboardV1Id},
+        wire::{ZwpVirtualKeyboardV1Id, zwp_virtual_keyboard_v1::*},
     },
     std::{cell::Cell, io::Write, rc::Rc},
     uapi::c,

src/it/test_ifs/test_virtual_keyboard_manager.rs

@@ -6,7 +6,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{zwp_virtual_keyboard_manager_v1::*, ZwpVirtualKeyboardManagerV1Id},
+        wire::{ZwpVirtualKeyboardManagerV1Id, zwp_virtual_keyboard_manager_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_wl_fixes.rs

@@ -4,7 +4,7 @@ use {
             test_error::TestResult, test_ifs::test_registry::TestRegistry, test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{wl_fixes::*, WlFixesId},
+        wire::{WlFixesId, wl_fixes::*},
     },
     std::rc::Rc,
 };

src/it/test_ifs/test_xdg_activation.rs

@@ -8,7 +8,7 @@ use {
             test_object::TestObject,
             test_transport::TestTransport,
         },
-        wire::{xdg_activation_v1::*, XdgActivationV1Id},
+        wire::{XdgActivationV1Id, xdg_activation_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_xdg_activation_token.rs

@@ -5,7 +5,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{xdg_activation_token_v1::*, XdgActivationTokenV1Id},
+        wire::{XdgActivationTokenV1Id, xdg_activation_token_v1::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_xdg_base.rs

@@ -5,7 +5,7 @@ use {
             test_object::TestObject, test_transport::TestTransport, testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{xdg_wm_base::*, WlSurfaceId, XdgWmBaseId},
+        wire::{WlSurfaceId, XdgWmBaseId, xdg_wm_base::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_xdg_surface.rs

@@ -9,7 +9,7 @@ use {
             testrun::ParseFull,
         },
         utils::buffd::MsgParser,
-        wire::{xdg_surface::*, XdgSurfaceId},
+        wire::{XdgSurfaceId, xdg_surface::*},
     },
     std::{cell::Cell, rc::Rc},
 };

src/it/test_ifs/test_xdg_toplevel.rs

@@ -9,7 +9,7 @@ use {
         },
         tree::{ContainerNode, ContainingNode, FloatNode, ToplevelNodeBase},
         utils::buffd::MsgParser,
-        wire::{xdg_toplevel::*, XdgToplevelId},
+        wire::{XdgToplevelId, xdg_toplevel::*},
     },
     ahash::AHashSet,
     std::{

src/it/test_mem.rs

@@ -4,7 +4,7 @@ use {
         utils::{oserror::OsError, ptr_ext::PtrExt},
     },
     std::{cell::Cell, ops::Deref, ptr, rc::Rc},
-    uapi::{c, OwnedFd},
+    uapi::{OwnedFd, c},
 };
 
 pub struct TestMem {

src/it/tests/t0011_set_keymap.rs

@@ -37,10 +37,11 @@ xkb_keymap {
 
     ds.kb.press(1);
     run.sync().await;
-    tassert!(run
-        .cfg
-        .invoked_shortcuts
-        .contains(&(ds.seat.id(), SYM_F13.into())));
+    tassert!(
+        run.cfg
+            .invoked_shortcuts
+            .contains(&(ds.seat.id(), SYM_F13.into()))
+    );
 
     Ok(())
 }

src/it/tests/t0031_syncobj.rs

@@ -3,7 +3,7 @@ use {
         it::{test_error::TestResult, testrun::TestRun},
         theme::Color,
         utils::errorfmt::ErrorFmt,
-        video::drm::{sync_obj::SyncObjPoint, wait_for_sync_obj::SyncObjWaiter, DrmError},
+        video::drm::{DrmError, sync_obj::SyncObjPoint, wait_for_sync_obj::SyncObjWaiter},
     },
     std::{cell::Cell, rc::Rc},
 };
@@ -24,7 +24,9 @@ async fn test(run: Rc<TestRun>) -> TestResult {
 
     let eng = run.state.render_ctx.get().unwrap();
     let Some(ctx) = eng.sync_obj_ctx() else {
-        log::warn!("Cannot test explicit sync on this system: render context does not support sync objects");
+        log::warn!(
+            "Cannot test explicit sync on this system: render context does not support sync objects"
+        );
         return Ok(());
     };
     let syncobj = match ctx.create_sync_obj() {

src/it/tests/t0042_toplevel_select.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        ifs::wl_seat::{ToplevelSelector, BTN_LEFT},
+        ifs::wl_seat::{BTN_LEFT, ToplevelSelector},
         it::{test_error::TestResult, testrun::TestRun},
         tree::{Node, ToplevelNode},
         utils::clonecell::CloneCell,