From 07127e73a970e7f0bd9dc68f7b7879b8f5329948 Mon Sep 17 00:00:00 2001 From: neuronull <9162534+neuronull@users.noreply.github.com> Date: Mon, 15 Sep 2025 19:44:20 -0600 Subject: [PATCH] convert printlns in objc crate --- apps/desktop/desktop_native/Cargo.lock | 1 + apps/desktop/desktop_native/objc/Cargo.toml | 1 + apps/desktop/desktop_native/objc/src/lib.rs | 11 ++++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock index 981cbcfd1aa..4c4c463bd13 100644 --- a/apps/desktop/desktop_native/Cargo.lock +++ b/apps/desktop/desktop_native/Cargo.lock @@ -950,6 +950,7 @@ dependencies = [ "glob", "thiserror 2.0.12", "tokio", + "tracing", ] [[package]] diff --git a/apps/desktop/desktop_native/objc/Cargo.toml b/apps/desktop/desktop_native/objc/Cargo.toml index 339cce2e024..cb02442980f 100644 --- a/apps/desktop/desktop_native/objc/Cargo.toml +++ b/apps/desktop/desktop_native/objc/Cargo.toml @@ -12,6 +12,7 @@ default = [] anyhow = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } +tracing = { workspace = true } [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "=0.10.0" diff --git a/apps/desktop/desktop_native/objc/src/lib.rs b/apps/desktop/desktop_native/objc/src/lib.rs index 60e48760da8..eaa9f66669a 100644 --- a/apps/desktop/desktop_native/objc/src/lib.rs +++ b/apps/desktop/desktop_native/objc/src/lib.rs @@ -66,6 +66,8 @@ impl Drop for ObjCString { mod objc { use std::os::raw::c_void; + use tracing::error; + use super::*; unsafe extern "C" { @@ -79,8 +81,9 @@ mod objc { let value: String = match value.try_into() { Ok(value) => value, Err(e) => { - println!( - "Error: Failed to convert ObjCString to Rust string during commandReturn: {e}" + error!( + error = %e, + "Error: Failed to convert ObjCString to Rust string during commandReturn" ); return false; @@ -90,7 +93,9 @@ mod objc { match context.send(value) { Ok(_) => 0, Err(e) => { - println!("Error: Failed to return ObjCString from ObjC code to Rust code: {e}"); + error!( + error = %e, + "Error: Failed to return ObjCString from ObjC code to Rust code"); return false; }