diff --git a/Cargo.toml b/Cargo.toml index 304c87e..87b4d2f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ReSet-Lib" -version = "0.2.1" +version = "0.2.2" edition = "2021" description = "Data structure library for ReSet" repository = "https://github.com/Xetibo/ReSet-Lib" diff --git a/src/utils.rs b/src/utils.rs index db16749..2548d04 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -92,20 +92,19 @@ pub fn call_reset_dbus_method< result } -pub enum Events< - AddedEvent: ReadAll + AppendAll + dbus::message::SignalArgs, - RemovedEvent: ReadAll + AppendAll + dbus::message::SignalArgs, -> { - AddedEvent(AddedEvent), - RemovedEvent(RemovedEvent), +pub enum Events { + AddedEvent(AddedType), + RemovedEvent(RemovedType), } pub fn start_event_listener< - AddedEvent: ReadAll + AppendAll + dbus::message::SignalArgs + Send + Sync + GetVal + 'static, - RemovedEvent: ReadAll + AppendAll + dbus::message::SignalArgs + Send + Sync + GetVal + 'static, + AddedType: ReadAll + AppendAll + Send + Sync + 'static, + RemovedType: ReadAll + AppendAll + Send + Sync + 'static, + AddedEvent: ReadAll + AppendAll + dbus::message::SignalArgs + GetVal, + RemovedEvent: ReadAll + AppendAll + dbus::message::SignalArgs + GetVal, >( active_listener: Arc, - sender: Arc>>, + sender: Arc>>, ) -> Result<(), dbus::Error> { thread::spawn(move || { let added_sender = sender.clone();