autocommit 2022-04-07 17:31:31 CEST

src/client/error.rs

@@ -1,10 +1,14 @@
-use crate::async_engine::AsyncError;
-use crate::client::ClientId;
-use crate::object::{Interface, ObjectId};
-use crate::utils::buffd::{BufFdError, MsgParserError};
-use crate::wire::WlDisplayId;
-use std::error::Error;
-use thiserror::Error;
+use {
+    crate::{
+        async_engine::AsyncError,
+        client::ClientId,
+        object::{Interface, ObjectId},
+        utils::buffd::{BufFdError, MsgParserError},
+        wire::WlDisplayId,
+    },
+    std::error::Error,
+    thiserror::Error,
+};
 
 #[derive(Debug, Error)]
 pub enum ClientError {

src/client/objects.rs

@@ -1,29 +1,38 @@
-use crate::client::{Client, ClientError};
-use crate::ifs::ipc::wl_data_source::WlDataSource;
-use crate::ifs::ipc::zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1;
-use crate::ifs::wl_buffer::WlBuffer;
-use crate::ifs::wl_display::WlDisplay;
-use crate::ifs::wl_output::WlOutput;
-use crate::ifs::wl_region::WlRegion;
-use crate::ifs::wl_registry::WlRegistry;
-use crate::ifs::wl_seat::WlSeat;
-use crate::ifs::wl_surface::xdg_surface::xdg_toplevel::XdgToplevel;
-use crate::ifs::wl_surface::xdg_surface::XdgSurface;
-use crate::ifs::wl_surface::WlSurface;
-use crate::ifs::xdg_positioner::XdgPositioner;
-use crate::ifs::xdg_wm_base::XdgWmBase;
-use crate::object::{Object, ObjectId};
-use crate::tree::Node;
-use crate::utils::clonecell::CloneCell;
-use crate::utils::copyhashmap::{CopyHashMap, Locked};
-use crate::wire::{
-    WlBufferId, WlDataSourceId, WlOutputId, WlRegionId, WlRegistryId, WlSeatId, WlSurfaceId,
-    XdgPositionerId, XdgSurfaceId, XdgToplevelId, XdgWmBaseId, ZwpPrimarySelectionSourceV1Id,
+use {
+    crate::{
+        client::{Client, ClientError},
+        ifs::{
+            ipc::{
+                wl_data_source::WlDataSource,
+                zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1,
+            },
+            wl_buffer::WlBuffer,
+            wl_display::WlDisplay,
+            wl_output::WlOutput,
+            wl_region::WlRegion,
+            wl_registry::WlRegistry,
+            wl_seat::WlSeat,
+            wl_surface::{
+                xdg_surface::{xdg_toplevel::XdgToplevel, XdgSurface},
+                WlSurface,
+            },
+            xdg_positioner::XdgPositioner,
+            xdg_wm_base::XdgWmBase,
+        },
+        object::{Object, ObjectId},
+        tree::Node,
+        utils::{
+            clonecell::CloneCell,
+            copyhashmap::{CopyHashMap, Locked},
+        },
+        wire::{
+            WlBufferId, WlDataSourceId, WlOutputId, WlRegionId, WlRegistryId, WlSeatId,
+            WlSurfaceId, XdgPositionerId, XdgSurfaceId, XdgToplevelId, XdgWmBaseId,
+            ZwpPrimarySelectionSourceV1Id,
+        },
+    },
+    std::{cell::RefCell, mem, ops::DerefMut, rc::Rc},
 };
-use std::cell::RefCell;
-use std::mem;
-use std::ops::DerefMut;
-use std::rc::Rc;
 
 pub struct Objects {
     pub display: CloneCell<Option<Rc<WlDisplay>>>,

src/client/tasks.rs

@@ -1,13 +1,17 @@
-use crate::async_engine::Phase;
-use crate::client::{Client, ClientError};
-use crate::object::ObjectId;
-use crate::utils::buffd::{BufFdIn, BufFdOut, MsgParser};
-use crate::utils::errorfmt::ErrorFmt;
-use crate::utils::vec_ext::VecExt;
-use futures_util::{select, FutureExt};
-use std::collections::VecDeque;
-use std::mem;
-use std::rc::Rc;
+use {
+    crate::{
+        async_engine::Phase,
+        client::{Client, ClientError},
+        object::ObjectId,
+        utils::{
+            buffd::{BufFdIn, BufFdOut, MsgParser},
+            errorfmt::ErrorFmt,
+            vec_ext::VecExt,
+        },
+    },
+    futures_util::{select, FutureExt},
+    std::{collections::VecDeque, mem, rc::Rc},
+};
 
 pub async fn client(data: Rc<Client>) {
     let mut recv = data.state.eng.spawn(receive(data.clone())).fuse();