fix: Don't use trait-alias

Author: Riey

Cargo.toml

@@ -1,10 +1,5 @@
 [workspace]
-members = [
-    ".",
-    "xim-ctext",
-    "xim-gen",
-    "xim-parser",
-]
+members = [".", "xim-ctext", "xim-gen", "xim-parser"]
 
 [package]
 name = "xim"
@@ -42,11 +37,13 @@ server = []
 xim-parser = { path = "./xim-parser", version = "0.2.0", default-features = false }
 xim-ctext = { path = "./xim-ctext", version = "0.3.0", default-features = false }
 log = { version = "0.4", default-features = false }
-ahash = { version = "0.8", default-features = false, features = ["compile-time-rng"] }
+ahash = { version = "0.8", default-features = false, features = [
+    "compile-time-rng",
+] }
 
 x11rb = { version = "0.13", optional = true }
 x11-dl = { version = "2.18.5", optional = true }
-hashbrown = { version = "0.14.0", default-features = false }
+hashbrown = { version = "0.16.0", default-features = false }
 
 [[example]]
 name = "x11rb_client"

examples/util/handler.rs

@@ -1,6 +1,6 @@
 use std::convert::TryInto;
 
-use xim::{AHashMap, Client, ClientError, ClientHandler};
+use xim::{AHashMap, Client, ClientCore, ClientError, ClientHandler};
 use xim_parser::{AttributeName, InputStyle, Point};
 
 #[derive(Default)]
@@ -11,16 +11,7 @@ pub struct ExampleHandler {
     pub window: u32,
 }
 
-#[cfg(all(feature = "x11rb-client", not(feature = "xlib-client")))]
-trait ClientAlias = Client<XEvent = x11rb::protocol::xproto::KeyPressEvent>;
-
-#[cfg(all(feature = "xlib-client", not(feature = "x11rb-client")))]
-trait ClientAlias = Client<XEvent = x11_dl::xlib::XKeyPressedEvent>;
-
-#[cfg(all(feature = "xlib-client", feature = "x11rb-client"))]
-trait ClientAlias = Client;
-
-impl<C: ClientAlias> ClientHandler<C> for ExampleHandler {
+impl<T, C: Client<XEvent = T> + ClientCore<XEvent = T>> ClientHandler<C> for ExampleHandler {
     fn handle_connect(&mut self, client: &mut C) -> Result<(), ClientError> {
         log::trace!("Connected");
         client.open("en_US")
@@ -68,23 +59,15 @@ impl<C: ClientAlias> ClientHandler<C> for ExampleHandler {
 
     fn handle_forward_event(
         &mut self,
-        _client: &mut C,
+        client: &mut C,
         _input_method_id: u16,
         _input_context_id: u16,
         flag: xim::ForwardEventFlag,
-        xev: C::XEvent,
+        xev: T,
     ) -> Result<(), ClientError> {
-        #[cfg(all(feature = "x11rb-client", not(feature = "xlib-client")))]
-        let keycode = xev.detail;
-        #[cfg(all(feature = "xlib-client", not(feature = "x11rb-client")))]
-        let keycode = xev.keycode;
-
-        // When both feature are enabled, emit flag only.
-        #[cfg(all(feature = "xlib-client", feature = "x11rb-client"))]
-        log::info!("Handle forward event {:?}", flag);
+        let xev = client.serialize_event(&xev);
+        log::info!("Handle forward event {:?}, {}", flag, xev.detail);
 
-        #[cfg(not(all(feature = "xlib-client", feature = "x11rb-client")))]
-        log::info!("Handle forward event {:?}, {}", flag, keycode);
         Ok(())
     }
 

examples/x11rb_client.rs

@@ -1,5 +1,3 @@
-#![feature(trait_alias)]
-
 use x11rb::connection::Connection;
 use x11rb::protocol::{xproto::*, Event};
 use xim::{x11rb::X11rbClient, Client};

examples/xlib_client.rs

@@ -1,5 +1,3 @@
-#![feature(trait_alias)]
-
 use std::{mem::MaybeUninit, ptr};
 use x11_dl::xlib;
 use xim::{xlib::XlibClient, Client};

src/client.rs

@@ -277,8 +277,8 @@ pub trait ClientCore {
 pub trait Client {
     type XEvent;
 
-    fn build_ic_attributes(&self) -> AttributeBuilder;
-    fn build_im_attributes(&self) -> AttributeBuilder;
+    fn build_ic_attributes(&'_ self) -> AttributeBuilder<'_>;
+    fn build_im_attributes(&'_ self) -> AttributeBuilder<'_>;
 
     fn disconnect(&mut self) -> Result<(), ClientError>;
     fn open(&mut self, locale: &str) -> Result<(), ClientError>;
@@ -331,11 +331,11 @@ where
 {
     type XEvent = C::XEvent;
 
-    fn build_ic_attributes(&self) -> AttributeBuilder {
+    fn build_ic_attributes(&'_ self) -> AttributeBuilder<'_> {
         AttributeBuilder::new(self.ic_attributes())
     }
 
-    fn build_im_attributes(&self) -> AttributeBuilder {
+    fn build_im_attributes(&'_ self) -> AttributeBuilder<'_> {
         AttributeBuilder::new(self.im_attributes())
     }
 

src/lib.rs

@@ -41,7 +41,7 @@ pub mod x11rb;
 pub mod xlib;
 
 #[cfg(feature = "client")]
-pub use crate::client::{Client, ClientError, ClientHandler};
+pub use crate::client::{Client, ClientCore, ClientError, ClientHandler};
 
 #[cfg(feature = "server")]
 pub const ALL_LOCALES: &str = include_str!("./all_locales.txt");