Make module dependencies explicit across the workspace

compositor/src/handlers/activation.rs

@@ -2,7 +2,8 @@ use std::collections::VecDeque;
 use std::time::{Duration, Instant};
 
 use smithay::input::Seat;
-use smithay::reexports::wayland_server::{Resource, backend::ClientId};
+use smithay::reexports::wayland_server::Resource;
+use smithay::reexports::wayland_server::backend::ClientId;
 use smithay::utils::Serial;
 
 use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;

compositor/src/handlers/dispatch.rs

@@ -1,7 +1,7 @@
 use crate::Ferese;
+use smithay::reexports::wayland_server::backend::ClientId;
 use smithay::reexports::wayland_server::{
-    Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource, backend::ClientId,
-    protocol as wl,
+    Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource, protocol as wl,
 };
 use smithay::reexports::{
     wayland_protocols as protocols, wayland_protocols_misc as misc, wayland_protocols_wlr as wlr,

compositor/src/handlers/gamma_control.rs

@@ -9,7 +9,9 @@ use smithay::reexports::wayland_server::{
     Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
 };
 
-use crate::{Ferese, backends::direct::gamma, gamma::Ramp};
+use crate::Ferese;
+use crate::backends::direct::gamma;
+use crate::gamma::Ramp;
 
 pub(crate) fn init_global(display: &DisplayHandle) {
     display.create_global::<Ferese, ZwlrGammaControlManagerV1, ()>(1, ());

compositor/src/handlers/screenshot.rs

@@ -1,11 +1,9 @@
 //! Converts output-buffer readback into upright image coordinates.
 
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::mpsc::SyncSender as ReplySender;
-use std::sync::{
-    Arc,
-    atomic::{AtomicUsize, Ordering},
-};
 use std::time::{Duration, Instant};
 
 use ferese_ipc::Response;
@@ -1954,10 +1952,10 @@ mod tests {
     fn conversion_does_not_flip_vertically() {
         // Top row red, bottom row blue. An extra Y flip would swap them.
         let mut f = frame(Transform::Normal, 1, 2);
-        f.pixels = vec![0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00];
+        f.pixels = vec![0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00];
         let out = scale_and_convert(&f, 1, 2).unwrap();
-        assert_eq!(&out[0..4], &[0xFF, 0x00, 0x00, 255], "top row");
-        assert_eq!(&out[4..8], &[0x00, 0x00, 0xFF, 255], "bottom row");
+        assert_eq!(&out[0..4], &[0xff, 0x00, 0x00, 255], "top row");
+        assert_eq!(&out[4..8], &[0x00, 0x00, 0xff, 255], "bottom row");
     }
 
     #[test]
@@ -1971,7 +1969,7 @@ mod tests {
                 let value = (row * 2 + column) as u8;
                 padded.extend_from_slice(&[value, value, value, 255]);
             }
-            padded.extend_from_slice(&[0xEE; 4]);
+            padded.extend_from_slice(&[0xee; 4]);
         }
         f.pixels = padded;