diff --git a/CHANGELOG.md b/CHANGELOG.md index c6a25ea..3961a20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Update SCTK to 0.15, updating wayland-rs to `0.29` + ## 0.6.4 -- 2021-06-25 - Update SCTK to 0.14, significantly reducing the depdendency tree diff --git a/Cargo.toml b/Cargo.toml index ffa6a34..8dc11f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,11 +10,11 @@ license = "MIT" keywords = ["clipboard", "wayland"] [dependencies] -sctk = { package = "smithay-client-toolkit", version = "0.14", default-features = false } -wayland-client = { version = "0.28", features = ["use_system_lib"] } +sctk = { package = "smithay-client-toolkit", version = "0.15", default-features = false } +wayland-client = { version = "0.29", features = ["use_system_lib"] } [dev-dependencies] -sctk = { package = "smithay-client-toolkit", version = "0.14", default-features = false, features = ["calloop"] } +sctk = { package = "smithay-client-toolkit", version = "0.15", default-features = false, features = ["calloop"] } [features] default = ["dlopen"] diff --git a/src/env.rs b/src/env.rs index 4db2a7e..b7dc89c 100644 --- a/src/env.rs +++ b/src/env.rs @@ -1,4 +1,3 @@ -use sctk::MissingGlobal; use sctk::data_device::{DataDevice, DataDeviceHandler, DataDeviceHandling, DndEvent}; use sctk::primary_selection::{ PrimarySelectionDevice, PrimarySelectionDeviceManager, PrimarySelectionHandler, @@ -7,6 +6,7 @@ use sctk::primary_selection::{ use sctk::reexports::client::protocol::wl_seat::WlSeat; use sctk::reexports::client::{Attached, DispatchData}; use sctk::seat::{SeatData, SeatHandler, SeatHandling, SeatListener}; +use sctk::MissingGlobal; /// Environemt setup for smithay-clipboard. pub struct SmithayClipboard { @@ -57,7 +57,11 @@ impl DataDeviceHandling for SmithayClipboard { self.data_device_manager.set_callback(callback) } - fn with_device(&self, seat: &WlSeat, f: F) -> Result<(), MissingGlobal> { + fn with_device( + &self, + seat: &WlSeat, + f: F, + ) -> Result<(), MissingGlobal> { self.data_device_manager.with_device(seat, f) } } diff --git a/src/lib.rs b/src/lib.rs index 548c068..d0fd09d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,7 +3,7 @@ //! Provides access to the Wayland clipboard for gui applications. The user should have surface //! around. -#![deny(clippy::all, clippy::if_not_else, clippy::enum_glob_use, clippy::wrong_pub_self_convention)] +#![deny(clippy::all, clippy::if_not_else, clippy::enum_glob_use)] use std::ffi::c_void; use std::io::Result; use std::sync::mpsc::{self, Receiver, Sender};