From 4bbc9ac7c8e2243884f2a3cf14ce15af9bc2679a Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Sat, 16 Sep 2023 06:04:58 -0700 Subject: [PATCH] Update `wayland-backend` to 0.3 Drop feature flags for wayland-backend versions. --- Cargo.toml | 6 +----- src/lib.rs | 8 +------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 93799df..4ec496c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,8 +14,4 @@ rust-version = "1.65.0" [dependencies] bitflags = "2.0" cursor-icon = "1.0.0" -wayland-backend_0_1 = { package = "wayland-backend", version = "0.1.0", default-features = false, optional = true } -wayland-backend_0_2 = { package = "wayland-backend", version = "0.2.0", default-features = false, optional = true } - -[features] -default = ["wayland-backend_0_2"] +wayland-backend = { version = "0.3.0", default-features = false } diff --git a/src/lib.rs b/src/lib.rs index b4b6d7d..657187b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -22,14 +22,8 @@ use std::num::NonZeroU32; use std::time::Duration; -#[cfg(not(any(feature = "wayland-backend_0_1", feature = "wayland-backend_0_2")))] -compile_error!("Ether wayland-backend_0_1 or wayland-backend_0_2 feature must be enabled"); - use bitflags::bitflags; -#[cfg(feature = "wayland-backend_0_1")] -use wayland_backend_0_1::client::ObjectId; -#[cfg(feature = "wayland-backend_0_2")] -use wayland_backend_0_2::client::ObjectId; +use wayland_backend::client::ObjectId; #[doc(inline)] pub use cursor_icon::{CursorIcon, ParseError as CursorIconParseError};