diff --git a/src/wayland/compositor/handlers.rs b/src/wayland/compositor/handlers.rs index b4ca2aa..f3e51a1 100644 --- a/src/wayland/compositor/handlers.rs +++ b/src/wayland/compositor/handlers.rs @@ -2,7 +2,7 @@ use std::{cell::RefCell, rc::Rc, sync::Mutex}; use wayland_server::{ protocol::{wl_compositor, wl_region, wl_subcompositor, wl_subsurface, wl_surface}, - NewResource, Resource, + NewResource, }; use super::{ diff --git a/src/wayland/compositor/mod.rs b/src/wayland/compositor/mod.rs index 92850d8..e53d656 100644 --- a/src/wayland/compositor/mod.rs +++ b/src/wayland/compositor/mod.rs @@ -95,7 +95,7 @@ use wayland_server::{ protocol::{ wl_buffer, wl_callback, wl_compositor, wl_output, wl_region, wl_subcompositor, wl_surface::WlSurface, }, - Display, Global, NewResource, Resource, + Display, Global, NewResource, }; /// Description of which part of a surface diff --git a/src/wayland/compositor/tree.rs b/src/wayland/compositor/tree.rs index f3f99da..5b1197e 100644 --- a/src/wayland/compositor/tree.rs +++ b/src/wayland/compositor/tree.rs @@ -1,6 +1,6 @@ use super::{roles::*, SubsurfaceRole, SurfaceAttributes}; use std::sync::Mutex; -use wayland_server::{protocol::wl_surface::WlSurface, Resource}; +use wayland_server::protocol::wl_surface::WlSurface; /// Node of a subsurface tree, holding some user specified data type U /// at each node diff --git a/src/wayland/data_device/data_source.rs b/src/wayland/data_device/data_source.rs index 9ebe10b..9b11685 100644 --- a/src/wayland/data_device/data_source.rs +++ b/src/wayland/data_device/data_source.rs @@ -5,7 +5,7 @@ use wayland_server::{ wl_data_device_manager::DndAction, wl_data_source::{Request, WlDataSource}, }, - NewResource, Resource, + NewResource, }; /// The metadata describing a data source diff --git a/src/wayland/data_device/dnd_grab.rs b/src/wayland/data_device/dnd_grab.rs index 32e47fb..b98bbdb 100644 --- a/src/wayland/data_device/dnd_grab.rs +++ b/src/wayland/data_device/dnd_grab.rs @@ -2,11 +2,8 @@ use std::cell::RefCell; use std::rc::Rc; use wayland_server::{ - protocol::{ - wl_data_device, wl_data_device_manager::DndAction, wl_data_offer, wl_data_source, wl_pointer, - wl_surface, - }, - NewResource, Resource, + protocol::{wl_data_device_manager::DndAction, wl_data_offer, wl_data_source, wl_pointer, wl_surface}, + NewResource, }; use crate::wayland::{ diff --git a/src/wayland/data_device/mod.rs b/src/wayland/data_device/mod.rs index fbef6b7..c24cef1 100644 --- a/src/wayland/data_device/mod.rs +++ b/src/wayland/data_device/mod.rs @@ -66,7 +66,7 @@ use wayland_server::{ wl_data_device_manager::{self, DndAction}, wl_data_offer, wl_data_source, wl_surface, }, - Client, Display, Global, NewResource, Resource, + Client, Display, Global, NewResource, }; use crate::wayland::{ diff --git a/src/wayland/data_device/server_dnd_grab.rs b/src/wayland/data_device/server_dnd_grab.rs index 4c094b7..ac1de8d 100644 --- a/src/wayland/data_device/server_dnd_grab.rs +++ b/src/wayland/data_device/server_dnd_grab.rs @@ -3,8 +3,8 @@ use std::os::unix::io::RawFd; use std::rc::Rc; use wayland_server::{ - protocol::{wl_data_device, wl_data_device_manager::DndAction, wl_data_offer, wl_pointer, wl_surface}, - NewResource, Resource, + protocol::{wl_data_device_manager::DndAction, wl_data_offer, wl_pointer, wl_surface}, + NewResource, }; use crate::wayland::seat::{AxisFrame, PointerGrab, PointerInnerHandle, Seat}; diff --git a/src/wayland/output/mod.rs b/src/wayland/output/mod.rs index 3ffd49a..6620db1 100644 --- a/src/wayland/output/mod.rs +++ b/src/wayland/output/mod.rs @@ -55,8 +55,8 @@ use std::sync::{Arc, Mutex}; use wayland_server::protocol::wl_output::{Subpixel, Transform}; use wayland_server::{ - protocol::wl_output::{Event, Mode as WMode, Request, WlOutput}, - Display, Global, NewResource, Resource, + protocol::wl_output::{Mode as WMode, WlOutput}, + Display, Global, NewResource, }; /// An output mode diff --git a/src/wayland/seat/keyboard.rs b/src/wayland/seat/keyboard.rs index e34921b..34fe188 100644 --- a/src/wayland/seat/keyboard.rs +++ b/src/wayland/seat/keyboard.rs @@ -9,10 +9,10 @@ use std::{ use tempfile::tempfile; use wayland_server::{ protocol::{ - wl_keyboard::{Event, KeyState as WlKeyState, KeymapFormat, Request, WlKeyboard}, + wl_keyboard::{KeyState as WlKeyState, KeymapFormat, Request, WlKeyboard}, wl_surface::WlSurface, }, - Client, NewResource, Resource, + Client, NewResource, }; use xkbcommon::xkb; pub use xkbcommon::xkb::{keysyms, Keysym}; diff --git a/src/wayland/seat/mod.rs b/src/wayland/seat/mod.rs index bb8ad69..d0f925d 100644 --- a/src/wayland/seat/mod.rs +++ b/src/wayland/seat/mod.rs @@ -61,7 +61,7 @@ use wayland_commons::utils::UserDataMap; use wayland_server::{ protocol::{wl_seat, wl_surface}, - Display, Global, NewResource, Resource, + Display, Global, NewResource, }; struct Inner { diff --git a/src/wayland/seat/pointer.rs b/src/wayland/seat/pointer.rs index 1cbbb07..2e0fc4f 100644 --- a/src/wayland/seat/pointer.rs +++ b/src/wayland/seat/pointer.rs @@ -3,10 +3,10 @@ use std::rc::Rc; use wayland_server::{ protocol::{ - wl_pointer::{self, Axis, AxisSource, ButtonState, Event, Request, WlPointer}, + wl_pointer::{self, Axis, AxisSource, ButtonState, Request, WlPointer}, wl_surface::WlSurface, }, - NewResource, Resource, + NewResource, }; use crate::wayland::compositor::{roles::Role, CompositorToken}; diff --git a/src/wayland/shell/legacy/mod.rs b/src/wayland/shell/legacy/mod.rs index 3615447..94ddbd2 100644 --- a/src/wayland/shell/legacy/mod.rs +++ b/src/wayland/shell/legacy/mod.rs @@ -80,7 +80,7 @@ use crate::wayland::compositor::{roles::Role, CompositorToken}; use wayland_server::{ protocol::{wl_output, wl_seat, wl_shell, wl_shell_surface, wl_surface}, - Display, Global, Resource, + Display, Global, }; mod wl_handlers; diff --git a/src/wayland/shell/legacy/wl_handlers.rs b/src/wayland/shell/legacy/wl_handlers.rs index bad99d7..1cebb7d 100644 --- a/src/wayland/shell/legacy/wl_handlers.rs +++ b/src/wayland/shell/legacy/wl_handlers.rs @@ -6,7 +6,7 @@ use std::{ use wayland_server::{ protocol::{wl_shell, wl_shell_surface, wl_surface}, - NewResource, Resource, + NewResource, }; use crate::wayland::compositor::{roles::Role, CompositorToken}; diff --git a/src/wayland/shell/xdg/mod.rs b/src/wayland/shell/xdg/mod.rs index 88792c6..1e9fd8d 100644 --- a/src/wayland/shell/xdg/mod.rs +++ b/src/wayland/shell/xdg/mod.rs @@ -103,7 +103,7 @@ use wayland_protocols::{ }; use wayland_server::{ protocol::{wl_output, wl_seat, wl_surface}, - Display, Global, Resource, + Display, Global, }; // handlers for the xdg_shell protocol diff --git a/src/wayland/shell/xdg/xdg_handlers.rs b/src/wayland/shell/xdg/xdg_handlers.rs index d1d5ada..252a5d4 100644 --- a/src/wayland/shell/xdg/xdg_handlers.rs +++ b/src/wayland/shell/xdg/xdg_handlers.rs @@ -4,7 +4,7 @@ use crate::wayland::compositor::{roles::*, CompositorToken}; use wayland_protocols::xdg_shell::server::{ xdg_popup, xdg_positioner, xdg_surface, xdg_toplevel, xdg_wm_base, }; -use wayland_server::{protocol::wl_surface, NewResource, Resource}; +use wayland_server::{protocol::wl_surface, NewResource}; use crate::utils::Rectangle; diff --git a/src/wayland/shell/xdg/zxdgv6_handlers.rs b/src/wayland/shell/xdg/zxdgv6_handlers.rs index 3812e16..0492065 100644 --- a/src/wayland/shell/xdg/zxdgv6_handlers.rs +++ b/src/wayland/shell/xdg/zxdgv6_handlers.rs @@ -7,7 +7,7 @@ use wayland_protocols::{ }, xdg_shell::server::{xdg_positioner, xdg_toplevel}, }; -use wayland_server::{protocol::wl_surface, NewResource, Resource}; +use wayland_server::{protocol::wl_surface, NewResource}; use crate::utils::Rectangle; diff --git a/src/wayland/shm/mod.rs b/src/wayland/shm/mod.rs index 147457e..9e74a83 100644 --- a/src/wayland/shm/mod.rs +++ b/src/wayland/shm/mod.rs @@ -81,7 +81,7 @@ use self::pool::{Pool, ResizeError}; use std::{rc::Rc, sync::Arc}; use wayland_server::{ protocol::{wl_buffer, wl_shm, wl_shm_pool}, - Display, Global, NewResource, Resource, + Display, Global, NewResource, }; mod pool;