tenseleyflow/hyprkvm / 423b1fa

Browse files

Fix compiler warnings and clean up unused code

- Remove unused imports and variables
- Add #[allow(dead_code)] for modules with planned features
- Rename key state constants to UPPER_CASE
Authored by mfwolffe <wolffemf@dukes.jmu.edu>
SHA
423b1fa7138976047d60a337848ae86f7cdaf44a
Parents
3a3059d
Tree
f2bf382

16 changed files

StatusFile+-
M hyprkvm-daemon/src/config/mod.rs 2 1
M hyprkvm-daemon/src/hyprland/events.rs 2 0
M hyprkvm-daemon/src/hyprland/ipc.rs 2 0
M hyprkvm-daemon/src/hyprland/layout.rs 4 4
M hyprkvm-daemon/src/hyprland/mod.rs 2 3
M hyprkvm-daemon/src/input/capture.rs 1 1
M hyprkvm-daemon/src/input/emulation.rs 4 4
M hyprkvm-daemon/src/input/mod.rs 5 3
M hyprkvm-daemon/src/main.rs 1 6
M hyprkvm-daemon/src/network/mod.rs 2 2
M hyprkvm-daemon/src/network/peer.rs 2 2
M hyprkvm-daemon/src/network/transport.rs 3 1
M hyprkvm-daemon/src/state/manager.rs 0 1
M hyprkvm-daemon/src/state/mod.rs 1 2
M hyprkvm-daemon/src/transfer/manager.rs 3 4
M hyprkvm-daemon/src/transfer/mod.rs 1 1
hyprkvm-daemon/src/config/mod.rsmodified
@@ -1,6 +1,7 @@
11
 //! Configuration management for HyprKVM
22
 
3
-use std::collections::HashMap;
3
+#![allow(dead_code)]
4
+
45
 use std::net::SocketAddr;
56
 use std::path::Path;
67
 
hyprkvm-daemon/src/hyprland/events.rsmodified
@@ -2,6 +2,8 @@
22
 //!
33
 //! Listens to Hyprland's event socket for real-time updates.
44
 
5
+#![allow(dead_code)]
6
+
57
 use std::path::PathBuf;
68
 
79
 use tokio::io::{AsyncBufReadExt, BufReader};
hyprkvm-daemon/src/hyprland/ipc.rsmodified
@@ -2,6 +2,8 @@
22
 //!
33
 //! Communicates with Hyprland via its Unix socket.
44
 
5
+#![allow(dead_code)]
6
+
57
 use std::path::PathBuf;
68
 
79
 use serde::de::DeserializeOwned;
hyprkvm-daemon/src/hyprland/layout.rsmodified
@@ -143,25 +143,25 @@ impl MonitorLayout {
143143
     }
144144
 
145145
     // Helper functions to find closest neighbor
146
-    fn is_closer_left(&self, current: &MonitorInfo, other: &MonitorInfo, existing: &Option<String>) -> bool {
146
+    fn is_closer_left(&self, _current: &MonitorInfo, other: &MonitorInfo, existing: &Option<String>) -> bool {
147147
         let Some(existing_name) = existing else { return true };
148148
         let Some(existing_mon) = self.monitors.get(existing_name) else { return true };
149149
         other.x + other.width as i32 > existing_mon.x + existing_mon.width as i32
150150
     }
151151
 
152
-    fn is_closer_right(&self, current: &MonitorInfo, other: &MonitorInfo, existing: &Option<String>) -> bool {
152
+    fn is_closer_right(&self, _current: &MonitorInfo, other: &MonitorInfo, existing: &Option<String>) -> bool {
153153
         let Some(existing_name) = existing else { return true };
154154
         let Some(existing_mon) = self.monitors.get(existing_name) else { return true };
155155
         other.x < existing_mon.x
156156
     }
157157
 
158
-    fn is_closer_up(&self, current: &MonitorInfo, other: &MonitorInfo, existing: &Option<String>) -> bool {
158
+    fn is_closer_up(&self, _current: &MonitorInfo, other: &MonitorInfo, existing: &Option<String>) -> bool {
159159
         let Some(existing_name) = existing else { return true };
160160
         let Some(existing_mon) = self.monitors.get(existing_name) else { return true };
161161
         other.y + other.height as i32 > existing_mon.y + existing_mon.height as i32
162162
     }
163163
 
164
-    fn is_closer_down(&self, current: &MonitorInfo, other: &MonitorInfo, existing: &Option<String>) -> bool {
164
+    fn is_closer_down(&self, _current: &MonitorInfo, other: &MonitorInfo, existing: &Option<String>) -> bool {
165165
         let Some(existing_name) = existing else { return true };
166166
         let Some(existing_mon) = self.monitors.get(existing_name) else { return true };
167167
         other.y < existing_mon.y
hyprkvm-daemon/src/hyprland/mod.rsmodified
@@ -4,8 +4,7 @@
44
 
55
 pub mod ipc;
66
 pub mod events;
7
+#[allow(dead_code)]
78
 pub mod layout;
9
+#[allow(dead_code)]
810
 pub mod edge;
9
-
10
-pub use ipc::HyprlandClient;
11
-pub use events::HyprlandEventStream;
hyprkvm-daemon/src/input/capture.rsmodified
@@ -180,7 +180,7 @@ impl EdgeCaptureState {
180180
         (min_x, min_y, max_x, max_y)
181181
     }
182182
 
183
-    fn draw_barrier(&mut self, barrier_idx: usize, qh: &QueueHandle<Self>) {
183
+    fn draw_barrier(&mut self, barrier_idx: usize, _qh: &QueueHandle<Self>) {
184184
         let barrier = &self.barriers[barrier_idx];
185185
         if !barrier.configured {
186186
             return;
hyprkvm-daemon/src/input/emulation.rsmodified
@@ -113,8 +113,8 @@ impl VirtualKeyboard {
113113
             .as_millis() as u32;
114114
 
115115
         let wl_state = match state {
116
-            KeyState::Pressed => wl_keyboard_key_state::Pressed,
117
-            KeyState::Released => wl_keyboard_key_state::Released,
116
+            KeyState::Pressed => wl_keyboard_key_state::PRESSED,
117
+            KeyState::Released => wl_keyboard_key_state::RELEASED,
118118
         };
119119
 
120120
         // Note: keycode needs to be offset by 8 for evdev->xkb conversion
@@ -129,8 +129,8 @@ impl VirtualKeyboard {
129129
 
130130
 // Key state constants
131131
 mod wl_keyboard_key_state {
132
-    pub const Released: u32 = 0;
133
-    pub const Pressed: u32 = 1;
132
+    pub const RELEASED: u32 = 0;
133
+    pub const PRESSED: u32 = 1;
134134
 }
135135
 
136136
 /// State for input emulation setup
hyprkvm-daemon/src/input/mod.rsmodified
@@ -2,10 +2,12 @@
22
 //!
33
 //! Handles input capture (when sending to remote) and injection (when receiving).
44
 
5
+#![allow(dead_code)]
6
+
57
 pub mod capture;
68
 pub mod emulation;
79
 pub mod grabber;
810
 
9
-pub use capture::{EdgeCapture, EdgeCaptureConfig, EdgeCaptureError, EdgeEvent};
10
-pub use emulation::{InputEmulator, VirtualKeyboard, VirtualPointer, EmulationError, button_codes};
11
-pub use grabber::{InputGrabber, InputGrabberConfig, GrabEvent, GrabberError};
11
+pub use capture::{EdgeCapture, EdgeCaptureConfig, EdgeEvent};
12
+pub use emulation::InputEmulator;
13
+pub use grabber::{InputGrabber, InputGrabberConfig};
hyprkvm-daemon/src/main.rsmodified
@@ -76,7 +76,7 @@ async fn main() -> anyhow::Result<()> {
7676
         _ => Level::TRACE,
7777
     };
7878
 
79
-    let subscriber = FmtSubscriber::builder()
79
+    FmtSubscriber::builder()
8080
         .with_max_level(log_level)
8181
         .with_target(false)
8282
         .init();
@@ -193,7 +193,6 @@ async fn run_daemon(config_path: &std::path::Path) -> anyhow::Result<()> {
193193
     info!("Listening for connections on {}", server.local_addr());
194194
 
195195
     // Spawn task to accept incoming connections
196
-    let peers_clone = peers.clone();
197196
     let machine_name = config.machines.self_name.clone();
198197
     let accept_handle = tokio::spawn(async move {
199198
         loop {
@@ -241,16 +240,12 @@ async fn run_daemon(config_path: &std::path::Path) -> anyhow::Result<()> {
241240
         }
242241
     });
243242
 
244
-    // Channel for incoming messages from peers
245
-    let (peer_msg_tx, mut peer_msg_rx) = tokio::sync::mpsc::channel::<(Direction, Message)>(64);
246
-
247243
     // Connect to configured peers
248244
     for neighbor in &config.machines.neighbors {
249245
         let addr = neighbor.address;
250246
         let direction = neighbor.direction;
251247
         let peers_clone = peers.clone();
252248
         let machine_name = config.machines.self_name.clone();
253
-        let msg_tx = peer_msg_tx.clone();
254249
 
255250
         tokio::spawn(async move {
256251
             info!("Connecting to {} at {}...", direction, addr);
hyprkvm-daemon/src/network/mod.rsmodified
@@ -2,8 +2,8 @@
22
 //!
33
 //! Handles peer-to-peer connections between HyprKVM instances.
44
 
5
+#[allow(dead_code)]
56
 pub mod peer;
67
 pub mod transport;
78
 
8
-pub use peer::{Peer, PeerError, PeerManager};
9
-pub use transport::{connect, FramedConnection, Server, TransportError};
9
+pub use transport::{connect, FramedConnection, Server};
hyprkvm-daemon/src/network/peer.rsmodified
@@ -7,7 +7,7 @@ use std::net::SocketAddr;
77
 use std::sync::Arc;
88
 use std::time::Duration;
99
 
10
-use tokio::sync::{mpsc, RwLock};
10
+use tokio::sync::RwLock;
1111
 use tokio::time::timeout;
1212
 
1313
 use hyprkvm_common::protocol::{
@@ -83,7 +83,7 @@ impl Peer {
8383
     pub async fn handshake_server(
8484
         mut conn: FramedConnection,
8585
         our_name: &str,
86
-        our_capabilities: &[String],
86
+        _our_capabilities: &[String],
8787
     ) -> Result<Self, PeerError> {
8888
         // Wait for Hello
8989
         let request = timeout(HANDSHAKE_TIMEOUT, conn.recv())
hyprkvm-daemon/src/network/transport.rsmodified
@@ -2,11 +2,13 @@
22
 //!
33
 //! Provides basic message framing and transport over TCP.
44
 
5
+#![allow(dead_code)]
6
+
57
 use std::io;
68
 use std::net::SocketAddr;
79
 
810
 use bytes::{Buf, BufMut, BytesMut};
9
-use tokio::io::{AsyncReadExt, AsyncWriteExt, BufReader, BufWriter};
11
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
1012
 use tokio::net::{TcpListener, TcpStream};
1113
 
1214
 use hyprkvm_common::protocol::Message;
hyprkvm-daemon/src/state/manager.rsmodified
@@ -4,7 +4,6 @@
44
 
55
 use std::net::SocketAddr;
66
 use std::sync::atomic::{AtomicBool, Ordering};
7
-use std::sync::Arc;
87
 
98
 use tokio::sync::RwLock;
109
 
hyprkvm-daemon/src/state/mod.rsmodified
@@ -2,6 +2,5 @@
22
 //!
33
 //! Maintains the unified state of the daemon.
44
 
5
+#[allow(dead_code)]
56
 pub mod manager;
6
-
7
-pub use manager::{ControlState, EdgeTrigger, NeighborInfo, StateError, StateManager};
hyprkvm-daemon/src/transfer/manager.rsmodified
@@ -1,8 +1,9 @@
11
 //! Transfer manager - orchestrates control handoff between machines
22
 
3
+#![allow(dead_code)]
4
+
35
 use std::sync::atomic::{AtomicU64, Ordering};
4
-use std::sync::Arc;
5
-use std::time::{Duration, Instant};
6
+use std::time::Instant;
67
 
78
 use tokio::sync::{mpsc, RwLock};
89
 
@@ -423,6 +424,4 @@ pub enum TransferError {
423424
     #[error("Channel closed")]
424425
     ChannelClosed,
425426
 
426
-    #[error("Timeout")]
427
-    Timeout,
428427
 }
hyprkvm-daemon/src/transfer/mod.rsmodified
@@ -4,4 +4,4 @@
44
 
55
 pub mod manager;
66
 
7
-pub use manager::{TransferError, TransferEvent, TransferManager, TransferState};
7
+pub use manager::{TransferEvent, TransferManager};