Overhaul dependencies and features

Cargo.toml

@@ -16,7 +16,7 @@ categories.workspace = true
 build = true
 
 [profile.release]
-opt-level = "z"
+opt-level = 3
 strip = true
 lto = true
 
@@ -33,27 +33,41 @@ authors = ["yavko <[email protected]>"]
 
 [dependencies]
 hyprland-macros = { path = "hyprland-macros", version = "0.3.4" }
-serde = {version = "1", features = ["derive"]}
+serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_repr = "0.1"
-hex = "0.4"
-tokio = { version = "1", features = ["full"], optional = true }
-async-net = { version = "2", optional = true }
-async-std = { version = "1", optional = true }
-futures-lite = { version = "2", optional = true }
-lazy_static = "1.4"
-regex = "1.10"
-async-trait = "0.1"
-num-traits = "0.2"
-doc-comment = "0.3"
-paste = "1"
-strum = { version = "0.26", features = ["derive"] }
-derive_more = "0.99"
-futures = "0.3"
+hex = "0.4.3"
+tokio = { version = "1", features = [
+    "io-std",
+    "io-util",
+    "net",
+], optional = true }
+async-net = { version = "2.0", optional = true }
+async-std = { version = "1.12", optional = true }
+futures-lite = { version = "2.3", optional = true, default-features = false }
+regex = { version = "1.10", default-features = false, features = [
+    "std",
+    "perf",
+    "unicode",
+] }
+num-traits = "0.2.18"
+doc-comment = "0.3.3"
+paste = "1.0.14"
+derive_more = { version = "0.99", default-features = false, features = [
+    "display",
+    "constructor",
+] }
+once_cell = "1.19"
+ahash = { version = "0.8", features = [
+    "std",
+    "serde",
+    "no-rng",
+], default-features = false, optional = true }
+parking_lot = { version = "0.12.1", optional = true }
 
 [features]
 default = ["listener", "dispatch", "data", "keyword", "config", "ctl", "tokio"]
-async-net = ["dep:async-net", "dep:futures-lite"]
+async-lite = ["dep:async-net", "dep:futures-lite"]
 async-std = ["dep:async-std", "dep:futures-lite"]
 tokio = ["dep:tokio"]
 dispatch = []
@@ -63,3 +77,9 @@ keyword = []
 config = ["dispatch", "keyword"]
 listener = ["data", "dispatch"]
 silent = []
+parking_lot = ["dep:parking_lot", "once_cell/parking_lot", "tokio?/parking_lot"]
+ahash = ["dep:ahash"]
+
+# for examples
+[dev-dependencies]
+tokio = { version = "1", features = ["macros", "io-std", "rt-multi-thread"] }

src/ctl.rs

@@ -1,6 +1,6 @@
 use derive_more::{Constructor, Display as MDisplay};
 use std::fmt::Display as FDisplay;
-use strum::{Display as SDisplay, EnumProperty};
+// use strum::{Display as SDisplay, EnumProperty};
 
 use crate::shared::*;
 
@@ -73,21 +73,28 @@ pub mod set_cursor {
 pub mod output {
     use super::*;
     /// Output backend types
-    #[derive(SDisplay)]
+    #[derive(Debug)]
     pub enum OutputBackends {
         /// The wayland output backend
-        #[strum(serialize = "wayland")]
         Wayland,
         /// The x11 output backend
-        #[strum(serialize = "x11")]
         X11,
         /// The headless output backend
-        #[strum(serialize = "headless")]
         Headless,
         /// Let Hyprland decide the backend type
-        #[strum(serialize = "auto")]
         Auto,
     }
+    impl std::fmt::Display for OutputBackends {
+        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+            match self {
+                Self::Wayland => "wayland",
+                Self::X11 => "x11",
+                Self::Headless => "headless",
+                Self::Auto => "auto",
+            }
+            .fmt(f)
+        }
+    }
 
     /// Create virtual displays
     pub fn create(backend: OutputBackends) -> crate::Result<()> {
@@ -237,7 +244,7 @@ pub mod set_prop {
     }
 
     /// Type that represents a prop
-    #[derive(EnumProperty, MDisplay)]
+    #[derive(MDisplay)]
     pub enum PropType {
         /// The animation style
         #[display(fmt = "animationstyle {}", "_0")]

src/data/helpers.rs

@@ -6,7 +6,6 @@ pub struct FullscreenState(
     pub bool,
 );
 
-#[async_trait]
 impl HyprData for FullscreenState {
     fn get() -> crate::Result<Self> {
         Ok(Self(Workspace::get_active()?.fullscreen))

src/data/macros.rs

@@ -1,6 +1,5 @@
 macro_rules! impl_on {
     ($name:ident) => {
-        #[async_trait]
         impl HyprData for $name {
             fn get() -> $crate::Result<Self> {
                 let data = call_hyprctl_data_cmd(DataCommands::$name)?;
@@ -145,7 +144,6 @@ macro_rules! create_data_struct {
             holding_type: $holding_type,
         );
 
-        #[async_trait]
         impl HyprData for $name {
             fn get() -> $crate::Result<Self> {
                 let data = call_hyprctl_data_cmd($cmd_kind)?;
@@ -186,7 +184,6 @@ macro_rules! create_data_struct {
             value: $value,
         );
 
-        #[async_trait]
         impl HyprData for $name {
             fn get() -> $crate::Result<Self> {
                 let data = call_hyprctl_data_cmd($cmd_kind)?;

src/data/mod.rs

@@ -42,6 +42,10 @@
 mod macros;
 
 use crate::shared::*;
+
+#[cfg(feature = "ahash")]
+use ahash::HashMap;
+#[cfg(not(feature = "ahash"))]
 use std::collections::HashMap;
 
 mod regular;

src/data/regular.rs

@@ -124,7 +124,6 @@ pub struct Monitor {
     pub vrr: bool,
 }
 
-#[async_trait]
 impl HyprDataActive for Monitor {
     fn get_active() -> crate::Result<Self> {
         let all = Monitors::get()?;
@@ -177,7 +176,6 @@ pub struct Workspace {
     pub last_window_title: String,
 }
 
-#[async_trait]
 impl HyprDataActive for Workspace {
     fn get_active() -> crate::Result<Self> {
         let data = call_hyprctl_data_cmd(DataCommands::ActiveWorkspace)?;
@@ -250,7 +248,6 @@ pub struct Client {
 #[serde(deny_unknown_fields)]
 struct Empty {}
 
-#[async_trait]
 impl HyprDataActiveOptional for Client {
     fn get_active() -> crate::Result<Option<Self>> {
         let data = call_hyprctl_data_cmd(DataCommands::ActiveWindow)?;
@@ -473,7 +470,9 @@ pub enum AnimationStyle {
     Slide,
     /// Vertical slide animation
     SlideVert,
+    /// Fading slide animation
     SlideFade,
+    /// Fading slide animation in a vertical direction
     SlideFadeVert,
     /// Popin animation (with percentage)
     PopIn(u8),
@@ -600,7 +599,6 @@ struct AnimationsRaw(Vec<AnimationRaw>, Vec<RawBezierIdent>);
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Animations(pub Vec<Animation>, pub Vec<BezierIdent>);
 
-#[async_trait]
 impl HyprData for Animations {
     fn get() -> crate::Result<Self>
     where
@@ -648,6 +646,7 @@ impl HyprData for Animations {
 
 // HACK: shadow and decorate are actually missing from the hyprctl json output for some reason
 // HACK: gaps_in and gaps_out are returned as arrays with 4 integers, even though Hyprland doesn't support per-side gaps
+/// The rules of an individual workspace, as returned by hyprctl json.
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct WorkspaceRuleset {
     /// The name of the workspace

src/event_listener/async_im.rs

@@ -32,7 +32,6 @@ impl Default for AsyncEventListener {
     }
 }
 
-#[async_trait]
 impl HasAsyncExecutor for AsyncEventListener {
     async fn event_executor_async(&mut self, event: Event) -> crate::Result<()> {
         match event {