autocommit 2022-02-04 00:45:22 CET

src/ifs/wl_seat/mod.rs

@@ -6,6 +6,7 @@ pub mod wl_touch;
 
 use crate::backend::{Seat, SeatId};
 use crate::client::{Client, ClientId, DynEventFormatter};
+use crate::cursor::{Cursor, KnownCursor};
 use crate::fixed::Fixed;
 use crate::globals::{Global, GlobalName};
 use crate::ifs::wl_data_device::{WlDataDevice, WlDataDeviceId};
@@ -30,7 +31,6 @@ use std::io::Write;
 use std::rc::Rc;
 pub use types::*;
 use uapi::{c, OwnedFd};
-use crate::cursor::{Cursor, KnownCursor};
 
 id!(WlSeatId);
 
@@ -142,12 +142,8 @@ impl WlSeatGlobal {
         if grabber.is_some() {
             return None;
         }
-        *grabber = Some(PointerGrabber {
-            node,
-        });
-        Some(PointerGrab {
-            seat: self.clone(),
-        })
+        *grabber = Some(PointerGrabber { node });
+        Some(PointerGrab { seat: self.clone() })
     }
 
     pub fn set_known_cursor(&self, cursor: KnownCursor) {

src/ifs/wl_seat/wl_pointer/mod.rs

@@ -1,6 +1,7 @@
 mod types;
 
 use crate::client::DynEventFormatter;
+use crate::cursor::Cursor;
 use crate::fixed::Fixed;
 use crate::ifs::wl_seat::WlSeatObj;
 use crate::ifs::wl_surface::WlSurfaceId;
@@ -8,7 +9,6 @@ use crate::object::{Interface, Object, ObjectId};
 use crate::utils::buffd::MsgParser;
 use std::rc::Rc;
 pub use types::*;
-use crate::cursor::Cursor;
 
 const SET_CURSOR: u32 = 0;
 const RELEASE: u32 = 1;