From 2b1dbb935f634bb104891c336773761d8c4eddf0 Mon Sep 17 00:00:00 2001
From: neuronull <9162534+neuronull@users.noreply.github.com>
Date: Mon, 3 Nov 2025 06:36:40 -0800
Subject: [PATCH] Desktop native disallow log crate macros (#17163)

---
 apps/desktop/desktop_native/Cargo.lock                | 2 +-
 apps/desktop/desktop_native/Cargo.toml                | 3 +++
 apps/desktop/desktop_native/clippy.toml               | 8 ++++++++
 apps/desktop/desktop_native/macos_provider/src/lib.rs | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock
index cf635f39df3..9a69ca62a1f 100644
--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -454,7 +454,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "verifysign",
  "windows 0.61.1",
 ]
 
@@ -621,6 +620,7 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
+ "verifysign",
  "windows 0.61.1",
 ]
 
diff --git a/apps/desktop/desktop_native/Cargo.toml b/apps/desktop/desktop_native/Cargo.toml
index 7a835b81c1b..4b5c1335c6b 100644
--- a/apps/desktop/desktop_native/Cargo.toml
+++ b/apps/desktop/desktop_native/Cargo.toml
@@ -86,10 +86,13 @@ zbus_polkit = "=5.0.0"
 zeroizing-alloc = "=0.1.0"
 
 [workspace.lints.clippy]
+disallowed-macros = "deny"
+
 # Dis-allow println and eprintln, which are typically used in debugging.
 # Use `tracing` and `tracing-subscriber` crates for observability needs.
 print_stderr = "deny"
 print_stdout = "deny"
+
 string_slice = "warn"
 unused_async = "deny"
 unwrap_used = "deny"
diff --git a/apps/desktop/desktop_native/clippy.toml b/apps/desktop/desktop_native/clippy.toml
index a29e019ac02..4441a038635 100644
--- a/apps/desktop/desktop_native/clippy.toml
+++ b/apps/desktop/desktop_native/clippy.toml
@@ -1,2 +1,10 @@
 allow-unwrap-in-tests=true
 allow-expect-in-tests=true
+
+disallowed-macros = [
+  { path = "log::trace", reason = "Use tracing for logging needs", replacement = "tracing::trace" },
+  { path = "log::debug", reason = "Use tracing for logging needs", replacement = "tracing::debug" },
+  { path = "log::info", reason = "Use tracing for logging needs", replacement = "tracing::info" },
+  { path = "log::warn", reason = "Use tracing for logging needs", replacement = "tracing::warn" },
+  { path = "log::error", reason = "Use tracing for logging needs", replacement = "tracing::error" },
+]
diff --git a/apps/desktop/desktop_native/macos_provider/src/lib.rs b/apps/desktop/desktop_native/macos_provider/src/lib.rs
index 359fe213996..a5a134b0bfe 100644
--- a/apps/desktop/desktop_native/macos_provider/src/lib.rs
+++ b/apps/desktop/desktop_native/macos_provider/src/lib.rs
@@ -1,4 +1,5 @@
 #![cfg(target_os = "macos")]
+#![allow(clippy::disallowed_macros)] // uniffi macros trip up clippy's evaluation
 
 use std::{
     collections::HashMap,