From 51eccc30dee95bd1511160c3aaf78c685c8b79b3 Mon Sep 17 00:00:00 2001
From: Marco Allegretti <mightymarco4@gmail.com>
Date: Fri, 13 Mar 2026 10:58:40 +0100
Subject: [PATCH] fix(ci): clippy lints in weft-appd, remove unused sd-notify
 dep, add missing apt packages

---
 .github/workflows/ci.yml     |  2 ++
 crates/weft-appd/Cargo.toml  |  1 -
 crates/weft-appd/src/main.rs | 34 +++++++++++++++-------------------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 172e66b..cfb2429 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,6 +62,7 @@ jobs:
             libseat-dev \
             libudev-dev \
             libsystemd-dev \
+            libdisplay-info-dev \
             pkg-config
       - name: cargo clippy (linux-only crates)
         run: >
@@ -97,6 +98,7 @@ jobs:
             libgles2-mesa-dev \
             libgbm-dev \
             libdrm-dev \
+            libfontconfig-dev \
             pkg-config
       - name: cargo check servo-embed (weft-servo-shell)
         run: >
diff --git a/crates/weft-appd/Cargo.toml b/crates/weft-appd/Cargo.toml
index fe6e021..8c3c8fc 100644
--- a/crates/weft-appd/Cargo.toml
+++ b/crates/weft-appd/Cargo.toml
@@ -10,7 +10,6 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = "1.0"
-sd-notify = "0.4"
 weft-ipc-types = { path = "../weft-ipc-types" }
 toml = "0.8"
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "io-util", "signal", "sync", "process", "time"] }
diff --git a/crates/weft-appd/src/main.rs b/crates/weft-appd/src/main.rs
index 4e96466..f72d659 100644
--- a/crates/weft-appd/src/main.rs
+++ b/crates/weft-appd/src/main.rs
@@ -334,12 +334,11 @@ pub(crate) async fn dispatch(req: Request, registry: &Registry) -> Response {
             let compositor_tx = registry.lock().await.compositor_tx.clone();
             let ipc_socket = session_ipc_socket_path(session_id);
             let broadcast = registry.lock().await.broadcast().clone();
-            if let Some(ref sock_path) = ipc_socket {
-                if let Some(tx) =
+            if let Some(ref sock_path) = ipc_socket
+                && let Some(tx) =
                     runtime::spawn_ipc_relay(session_id, sock_path.clone(), broadcast).await
-                {
-                    registry.lock().await.register_ipc_sender(session_id, tx);
-                }
+            {
+                registry.lock().await.register_ipc_sender(session_id, tx);
             }
             let reg = Arc::clone(registry);
             let aid = app_id.clone();
@@ -388,11 +387,11 @@ pub(crate) async fn dispatch(req: Request, registry: &Registry) -> Response {
             session_id,
             payload,
         } => {
-            if let Some(tx) = registry.lock().await.ipc_sender_for(session_id) {
-                if tx.send(payload).await.is_err() {
-                    tracing::warn!(session_id, "IPC relay sender closed");
-                    registry.lock().await.remove_ipc_sender(session_id);
-                }
+            if let Some(tx) = registry.lock().await.ipc_sender_for(session_id)
+                && tx.send(payload).await.is_err()
+            {
+                tracing::warn!(session_id, "IPC relay sender closed");
+                registry.lock().await.remove_ipc_sender(session_id);
             }
             Response::AppState {
                 session_id,
@@ -499,9 +498,8 @@ mod tests {
         unsafe { std::env::remove_var("WEFT_APPD_WS_PORT") };
         let port = ws_port();
         unsafe {
-            match prior {
-                Some(v) => std::env::set_var("WEFT_APPD_WS_PORT", v),
-                None => {}
+            if let Some(v) = prior {
+                std::env::set_var("WEFT_APPD_WS_PORT", v)
             }
         }
         assert_eq!(port, 7410);
@@ -545,13 +543,11 @@ mod tests {
         }
         let result = appd_socket_path();
         unsafe {
-            match prior_sock {
-                Some(v) => std::env::set_var("WEFT_APPD_SOCKET", v),
-                None => {}
+            if let Some(v) = prior_sock {
+                std::env::set_var("WEFT_APPD_SOCKET", v)
             }
-            match prior_xdg {
-                Some(v) => std::env::set_var("XDG_RUNTIME_DIR", v),
-                None => {}
+            if let Some(v) = prior_xdg {
+                std::env::set_var("XDG_RUNTIME_DIR", v)
             }
         }
         assert!(result.is_err());