From 3c7e91c28c433250fb8e425abbe9bcfaf569f6ab Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Sat, 11 Jul 2026 23:14:19 +0900
Subject: [PATCH] workspace deps sorting

---
 Cargo.toml                           |  6 ++++++
 dash-frontend/Cargo.toml             | 25 +++++++++++++++----------
 uidev/Cargo.toml                     | 19 ++++++++++---------
 uidev/src/testbed/testbed_generic.rs |  1 +
 wayvr-ipc/Cargo.toml                 | 10 +++++-----
 wayvr/Cargo.toml                     | 22 +++++++++++-----------
 wayvrctl/Cargo.toml                  |  8 +++++---
 wlx-capture/Cargo.toml               |  2 +-
 wlx-common/Cargo.toml                | 17 ++++++++++-------
 9 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index bfd05042..4214b9c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,11 +15,14 @@ members = [
 [workspace.dependencies]
 anyhow = "1.0.100"
 bytes = { version = "1.11.1" }
+chrono = "0.4.42"
 clap = { version = "4.5.53", features = ["derive"] }
 dbus = { version = "0.9.12" }
 glam = { version = "0.30.9", features = ["mint", "serde"] }
 idmap = "0.2.2"
 idmap-derive = "0.2.22"
+interprocess = { version = "2.2.3" }
+libc = "0.2.178"
 log = "0.4.29"
 pipewire = { version = "0.10", features = ["v0_3_33", "v0_3_65"] }
 regex = "1.12.2"
@@ -31,6 +34,8 @@ slotmap = "1.1.1"
 smallvec = "1.15.2"
 smol = "2.0.2"
 strum = { version = "0.27.2", features = ["derive"] }
+tokio = "1.48.0"  # TODO: switch to smol for ipc
+tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
 uuid = { version = "1.19.0", features = ["fast-rng", "serde", "v4"] }
 vulkano = {
   version = "0.35.2",
@@ -43,6 +48,7 @@ vulkano-shaders = "0.35.0"
 wayland-client = { version = "0.31" }
 wayland-protocols = { version = "0.32" }
 wayland-protocols-misc = { version = "0.3.12" }
+winit = "0.30.12"
 xdg = "3.0.0"
 
 [patch.crates-io]
diff --git a/dash-frontend/Cargo.toml b/dash-frontend/Cargo.toml
index 6b72aebc..2f5206c3 100644
--- a/dash-frontend/Cargo.toml
+++ b/dash-frontend/Cargo.toml
@@ -8,27 +8,32 @@ authors = ["galister", "oo8dev"]
 repository = "https://github.com/wlx-team/wayvr"
 
 [dependencies]
+wayvr-ipc = { path = "../wayvr-ipc", default-features = false }
+wgui = { path = "../wgui/" }
+wlx-common = { path = "../wlx-common" }
+
 anyhow.workspace = true
-async-native-tls = "0.5.0"
-chrono = "0.4.42"
+chrono.workspace = true
 glam = { workspace = true, features = ["mint", "serde"] }
-http-body-util = "0.1.3"
-hyper = { version = "1.8.1", features = ["client", "http1", "http2"] }
-keyvalues-parser = { git = "https://codeberg.org/CosmicHarper/vdf-rs.git", rev = "fc6dcbea9eb13cacb98dea40063f6f56cde6e145" }
 log.workspace = true
-lz4_flex = { version = "0.13.1", features = ["frame"] }
 rust-embed.workspace = true
 serde = { workspace = true, features = ["rc"] }
 serde_json.workspace = true
 smol = { workspace = true }
-smol-hyper = "0.1.1"
 strum.workspace = true
 uuid.workspace = true
-wayvr-ipc = { path = "../wayvr-ipc", default-features = false }
-wgui = { path = "../wgui/" }
-wlx-common = { path = "../wlx-common" }
 xdg.workspace = true
 
+async-native-tls = "0.5.0"
+http-body-util = "0.1.3"
+hyper = { version = "1.8.1", features = ["client", "http1", "http2"] }
+keyvalues-parser = {
+  git = "https://codeberg.org/CosmicHarper/vdf-rs.git",
+  rev = "fc6dcbea9eb13cacb98dea40063f6f56cde6e145"
+}
+lz4_flex = { version = "0.13.1", features = ["frame"] }
+smol-hyper = "0.1.1"
+
 [features]
 default = ["monado"]
 monado = []
diff --git a/uidev/Cargo.toml b/uidev/Cargo.toml
index 3c658de4..6c5f059d 100644
--- a/uidev/Cargo.toml
+++ b/uidev/Cargo.toml
@@ -8,14 +8,15 @@ authors = ["galister", "oo8dev"]
 repository = "https://github.com/wlx-team/wayvr"
 
 [dependencies]
-anyhow = { workspace = true }
-glam = { workspace = true }
-log = { workspace = true }
-rust-embed = "8.9.0"
-tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
-wgui = { path = "../wgui/" }
-winit = "0.30.12"
-vulkano = { workspace = true }
-vulkano-shaders = { workspace = true }
 dash-frontend = { path = "../dash-frontend/" }
+wgui = { path = "../wgui/" }
 wlx-common = { path = "../wlx-common" }
+
+anyhow.workspace = true
+glam.workspace = true
+log.workspace = true
+rust-embed.workspace = true
+tracing-subscriber.workspace = true
+vulkano.workspace = true
+vulkano-shaders.workspace = true
+winit.workspace = true
diff --git a/uidev/src/testbed/testbed_generic.rs b/uidev/src/testbed/testbed_generic.rs
index e64baf79..ceba38ed 100644
--- a/uidev/src/testbed/testbed_generic.rs
+++ b/uidev/src/testbed/testbed_generic.rs
@@ -119,6 +119,7 @@ impl TestbedGeneric {
 				rect.params.color = color;
 			})),
 			dev_mode: false,
+			..Default::default()
 		};
 
 		let (layout, parser_state) = wgui::parser::new_layout_from_assets(
diff --git a/wayvr-ipc/Cargo.toml b/wayvr-ipc/Cargo.toml
index bc3fee03..2efa2896 100644
--- a/wayvr-ipc/Cargo.toml
+++ b/wayvr-ipc/Cargo.toml
@@ -8,16 +8,16 @@ authors = ["galister", "oo8dev"]
 repository = "https://github.com/wlx-team/wayvr"
 
 [dependencies]
-anyhow = "1.0.93"
+anyhow.workspace = true
 bytes.workspace = true
-log = "0.4.22"
+log.workspace = true
 serde.workspace = true
-smallvec = "1.13.2"
+smallvec.workspace = true
 
 # client-only deps
-interprocess = { version = "2.2.2", features = ["tokio"], optional = true }
+interprocess = { workspace = true, features = ["tokio"], optional = true }
 serde_json.workspace = true
-tokio = { version = "1.43.1", features = ["macros"], optional = true }
+tokio = { workspace = true, features = ["macros"], optional = true }
 tokio-util = { version = "0.7.13", optional = true }
 
 [features]
diff --git a/wayvr/Cargo.toml b/wayvr/Cargo.toml
index e734b8e1..78fb5da9 100644
--- a/wayvr/Cargo.toml
+++ b/wayvr/Cargo.toml
@@ -27,11 +27,14 @@ wlx-capture = { path = "../wlx-capture" }
 wlx-common = { path = "../wlx-common" }
 
 anyhow.workspace = true
+chrono = { workspace = true, features = ["unstable-locales"] }
 clap.workspace = true
 dbus.workspace = true
 glam = { workspace = true, features = ["mint", "serde"] }
 idmap = { workspace = true, features = ["serde"] }
 idmap-derive.workspace = true
+interprocess.workspace = true
+libc.workspace = true
 log.workspace = true
 pipewire = { workspace = true, optional = true }
 regex.workspace = true
@@ -40,14 +43,21 @@ serde = { workspace = true, features = ["rc"] }
 serde_json.workspace = true
 serde_json5.workspace = true
 slotmap.workspace = true
+smallvec.workspace = true
+smol = { workspace = true }
 strum.workspace = true
+tracing-subscriber.workspace = true
+uuid = { workspace = true }
 vulkano.workspace = true
 vulkano-shaders.workspace = true
+wayland-client = { workspace = true }
+wayland-protocols = { workspace = true }
+wayland-protocols-misc = { workspace = true }
+winit = { workspace = true, optional = true }
 xdg.workspace = true
 
 ash = "^0.38.0"  # must match vulkano
 bytes = { workspace = true }
-chrono = { version = "0.4.42", features = ["unstable-locales"] }
 chrono-tz = "0.10.4"
 config = "0.15.19"
 futures = "0.3.31"
@@ -59,10 +69,8 @@ image_dds = {
   ]
 }
 input-linux = "0.7.1"
-interprocess = { version = "2.2.3" }
 json = { version = "0.12.4", optional = true }
 json5 = "1.3.0"
-libc = "0.2.178"
 libmonado = {
   git = "https://github.com/wayvr-org/libmonado-rs.git",
   rev = "6f66b26930c24a8a2fc57ddcd85704784894c750",
@@ -85,7 +93,6 @@ pure-rust-locales = "0.8.2"
 rosc = { version = "0.11.4", optional = true }
 serde_yaml = "0.9.34"
 signal-hook = "0.3.18"
-smallvec = "1.15.1"
 smithay = {
   version = "0.7.0",
   default-features = false,
@@ -97,17 +104,10 @@ smithay = {
   ]
 }
 smithay-clipboard = "0.7.3"
-smol = { workspace = true }
 sysinfo = { version = "0.37" }
 thiserror = "2.0"
 tracing = "0.1.43"
-tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
-uuid = { workspace = true }
-wayland-client = { workspace = true }
-wayland-protocols = { workspace = true }
-wayland-protocols-misc = { workspace = true }
 whisper-rs = { version = "0.16.0", features = ["vulkan"], optional = true }
-winit = { version = "0.30.12", optional = true }
 xcb = {
   version = "1.6.0",
   features = [
diff --git a/wayvrctl/Cargo.toml b/wayvrctl/Cargo.toml
index 1ac441e4..87b97a5d 100644
--- a/wayvrctl/Cargo.toml
+++ b/wayvrctl/Cargo.toml
@@ -8,12 +8,14 @@ authors = ["galister", "oo8dev"]
 repository = "https://github.com/wlx-team/wayvr"
 
 [dependencies]
+wayvr-ipc = { path = "../wayvr-ipc" }
+
 anyhow.workspace = true
-log.workspace = true
 clap.workspace = true
+log.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+tokio.workspace = true
+
 env_logger = "0.11.8"
-tokio = "1.48.0"
-wayvr-ipc = { path = "../wayvr-ipc" }
 shell-words = "1.1.1"
diff --git a/wlx-capture/Cargo.toml b/wlx-capture/Cargo.toml
index da9a0411..899d7bb4 100644
--- a/wlx-capture/Cargo.toml
+++ b/wlx-capture/Cargo.toml
@@ -13,6 +13,7 @@ license = "GPL-3.0-only"
 [dependencies]
 dbus = { workspace = true, features = ["futures"], optional = true }
 idmap = { workspace = true }
+libc.workspace = true
 log = { workspace = true }
 pipewire = { workspace = true, optional = true }
 slotmap.workspace = true
@@ -29,7 +30,6 @@ wayland-protocols = {
 }
 
 drm-fourcc = "2.2.0"
-libc = "0.2.178"
 rxscreen = {
   version = "0.1.7",
   features = [
diff --git a/wlx-common/Cargo.toml b/wlx-common/Cargo.toml
index da4f3665..920cf779 100644
--- a/wlx-common/Cargo.toml
+++ b/wlx-common/Cargo.toml
@@ -7,11 +7,11 @@ license = "GPL-3.0-only"
 authors = ["galister", "oo8dev"]
 repository = "https://github.com/wlx-team/wayvr"
 
-
 [dependencies]
 wayvr-ipc = { path = "../wayvr-ipc", default-features = false }
 
 anyhow.workspace = true
+chrono.workspace = true
 glam.workspace = true
 idmap = { workspace = true, features = ["serde"] }
 idmap-derive.workspace = true
@@ -19,14 +19,17 @@ log.workspace = true
 serde = { workspace = true, features = ["rc"] }
 serde_json.workspace = true
 serde_json5.workspace = true
+smol.workspace = true
 strum.workspace = true
 xdg.workspace = true
 
-chrono = "0.4.42"
-smol = { workspace = true }
-wgui = { path = "../wgui/" }
-rodio = { version = "0.22.2", default-features = false, features = ["playback", "mp3", "hound", "recording"] }
 glob = "0.3.3"
-walkdir = "2.5.0"
-rust-ini = "0.21.3"
 identicons-svg = "0.1.0"
+rodio = {
+  version = "0.22.2",
+  default-features = false,
+  features = ["hound", "mp3", "playback", "recording"]
+}
+rust-ini = "0.21.3"
+walkdir = "2.5.0"
+wgui = { path = "../wgui/" }