diff --git a/src/wayland/core/keyboard.rs b/src/wayland/core/keyboard.rs index 0d46ddd..c0ec398 100644 --- a/src/wayland/core/keyboard.rs +++ b/src/wayland/core/keyboard.rs @@ -248,7 +248,11 @@ impl WlKeyboard for Keyboard { type Connection = Client; /// https://wayland.app/protocols/wayland#wl_keyboard:request:release - async fn release(&self, _client: &mut Self::Connection, _sender_id: ObjectId) -> WaylandResult<()> { + async fn release( + &self, + _client: &mut Self::Connection, + _sender_id: ObjectId, + ) -> WaylandResult<()> { Ok(()) } } diff --git a/src/wayland/core/output.rs b/src/wayland/core/output.rs index 9c12fd4..917c05f 100644 --- a/src/wayland/core/output.rs +++ b/src/wayland/core/output.rs @@ -47,7 +47,11 @@ impl WlOutput for Output { type Connection = Client; /// https://wayland.app/protocols/wayland#wl_output:request:release - async fn release(&self, _client: &mut Self::Connection, _sender_id: ObjectId) -> WaylandResult<()> { + async fn release( + &self, + _client: &mut Self::Connection, + _sender_id: ObjectId, + ) -> WaylandResult<()> { Ok(()) } } diff --git a/src/wayland/core/seat.rs b/src/wayland/core/seat.rs index 05bf30a..38c7953 100644 --- a/src/wayland/core/seat.rs +++ b/src/wayland/core/seat.rs @@ -2,11 +2,11 @@ use crate::wayland::Client; use crate::wayland::WaylandResult; use crate::wayland::core::{keyboard::Keyboard, pointer::Pointer, surface::Surface, touch::Touch}; use mint::Vector2; -use waynest_server::Client as _; use std::sync::Arc; use std::sync::OnceLock; use waynest::ObjectId; pub use waynest_protocols::server::core::wayland::wl_seat::*; +use waynest_server::Client as _; #[derive(Debug)] pub enum SeatMessage { diff --git a/src/wayland/display.rs b/src/wayland/display.rs index f924e1c..d4d63e9 100644 --- a/src/wayland/display.rs +++ b/src/wayland/display.rs @@ -10,13 +10,13 @@ use crate::wayland::{ registry::Registry, }; use global_counter::primitive::exact::CounterU32; -use waynest_server::Client as _; use std::{ sync::{Arc, OnceLock}, time::Instant, }; use waynest::ObjectId; pub use waynest_protocols::server::core::wayland::wl_display::*; +use waynest_server::Client as _; #[derive(waynest_server::RequestDispatcher)] #[waynest(error = crate::wayland::WaylandError, connection = crate::wayland::Client)] diff --git a/src/wayland/dmabuf/buffer_params.rs b/src/wayland/dmabuf/buffer_params.rs index 249d035..9f02dc5 100644 --- a/src/wayland/dmabuf/buffer_params.rs +++ b/src/wayland/dmabuf/buffer_params.rs @@ -8,12 +8,12 @@ use bevy_dmabuf::dmatex::DmatexPlane; use drm_fourcc::DrmFourcc; use parking_lot::Mutex; use rustc_hash::FxHashMap; -use waynest_server::Client as _; use std::os::fd::{AsRawFd, OwnedFd}; use waynest::ObjectId; use waynest_protocols::server::stable::linux_dmabuf_v1::zwp_linux_buffer_params_v1::{ Error, Flags, ZwpLinuxBufferParamsV1, }; +use waynest_server::Client as _; /// Parameters for creating a DMA-BUF-based wl_buffer /// diff --git a/src/wayland/dmabuf/mod.rs b/src/wayland/dmabuf/mod.rs index cfa9553..0662d19 100644 --- a/src/wayland/dmabuf/mod.rs +++ b/src/wayland/dmabuf/mod.rs @@ -15,11 +15,11 @@ use buffer_params::BufferParams; use drm_fourcc::DrmFourcc; use feedback::DmabufFeedback; use rustc_hash::FxHashSet; -use waynest_server::Client as _; use std::sync::LazyLock; use vulkano::format::FormatFeatures; use waynest::ObjectId; use waynest_protocols::server::stable::linux_dmabuf_v1::zwp_linux_dmabuf_v1::ZwpLinuxDmabufV1; +use waynest_server::Client as _; pub static DMABUF_FORMATS: LazyLock> = LazyLock::new(|| { let vk = VULKANO_CONTEXT.wait(); @@ -158,7 +158,8 @@ impl ZwpLinuxDmabufV1 for Dmabuf { }); } // Create feedback object for default (non-surface-specific) settings - let feedback = client.insert(id, DmabufFeedback(client.get::(sender_id).unwrap()))?; + let feedback = + client.insert(id, DmabufFeedback(client.get::(sender_id).unwrap()))?; feedback.send_params(client, id).await?; Ok(()) } diff --git a/src/wayland/xdg/popup.rs b/src/wayland/xdg/popup.rs index 054cbf7..a21ba3e 100644 --- a/src/wayland/xdg/popup.rs +++ b/src/wayland/xdg/popup.rs @@ -6,10 +6,10 @@ use crate::nodes::items::panel::SurfaceId; use crate::wayland::WaylandResult; use parking_lot::Mutex; use rand::Rng; -use waynest_server::Client as _; use std::sync::Arc; use waynest::ObjectId; use waynest_protocols::server::stable::xdg_shell::xdg_popup::XdgPopup; +use waynest_server::Client as _; #[derive(Debug, waynest_server::RequestDispatcher)] #[waynest(error = crate::wayland::WaylandError, connection = crate::wayland::Client)] diff --git a/src/wayland/xdg/toplevel.rs b/src/wayland/xdg/toplevel.rs index ce30284..350fb90 100644 --- a/src/wayland/xdg/toplevel.rs +++ b/src/wayland/xdg/toplevel.rs @@ -11,10 +11,10 @@ use crate::{ }; use mint::Vector2; use parking_lot::Mutex; -use waynest_server::Client as _; use std::sync::Arc; use waynest::ObjectId; pub use waynest_protocols::server::stable::xdg_shell::xdg_toplevel::*; +use waynest_server::Client as _; #[derive(Debug)] pub struct MappedInner {