Remove x11-dl from winit-common

winit-common/Cargo.toml

@@ -14,7 +14,7 @@ event-handler = []
 
 # XKB
 wayland = ["dep:memmap2"]
-x11 = ["xkbcommon-dl?/x11", "dep:x11-dl"]
+x11 = ["xkbcommon-dl?/x11"]
 xkb = ["dep:xkbcommon-dl", "dep:smol_str"]
 
 # CoreFoundation
@@ -30,7 +30,6 @@ winit-core.workspace = true
 
 # XKB
 memmap2 = { workspace = true, optional = true }
-x11-dl = { workspace = true, optional = true }
 xkbcommon-dl = { workspace = true, optional = true }
 
 # Foundation / CoreFoundation

winit-common/src/xkb/keymap.rs

@@ -7,9 +7,9 @@ use std::ptr::{self, NonNull};
 use winit_core::keyboard::{
     Key, KeyCode, KeyLocation, NamedKey, NativeKey, NativeKeyCode, PhysicalKey,
 };
-#[cfg(feature = "x11")]
-use x11_dl::xlib_xcb::xcb_connection_t;
 use xkb::XKB_MOD_INVALID;
+#[cfg(feature = "x11")]
+use xkbcommon_dl::x11::xcb_connection_t;
 use xkbcommon_dl::{
     self as xkb, xkb_keycode_t, xkb_keymap, xkb_keymap_compile_flags, xkb_keysym_t,
     xkb_layout_index_t, xkb_mod_index_t,

winit-common/src/xkb/mod.rs

@@ -9,12 +9,12 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use smol_str::SmolStr;
 use winit_core::event::{ElementState, KeyEvent};
 use winit_core::keyboard::{Key, KeyLocation};
+#[cfg(feature = "x11")]
+use xkbcommon_dl::x11::{xcb_connection_t, xkbcommon_x11_handle};
 use xkbcommon_dl::{
     self as xkb, XkbCommon, XkbCommonCompose, xkb_compose_status, xkb_context, xkb_context_flags,
     xkbcommon_compose_handle, xkbcommon_handle,
 };
-#[cfg(feature = "x11")]
-use {x11_dl::xlib_xcb::xcb_connection_t, xkbcommon_dl::x11::xkbcommon_x11_handle};
 
 mod compose;
 mod keymap;

winit-common/src/xkb/state.rs

@@ -5,7 +5,7 @@ use std::ptr::NonNull;
 
 use smol_str::SmolStr;
 #[cfg(feature = "x11")]
-use x11_dl::xlib_xcb::xcb_connection_t;
+use xkbcommon_dl::x11::xcb_connection_t;
 use xkbcommon_dl::{
     self as xkb, xkb_keycode_t, xkb_keysym_t, xkb_layout_index_t, xkb_state, xkb_state_component,
 };