refactor: reduce macro-generated lines by >70%

src/accounts.rs

@@ -14,6 +14,7 @@ use serde::{Deserialize, Serialize};
 use tokio::fs;
 use tokio::io::AsyncWriteExt;
 use tokio::task::{JoinHandle, JoinSet};
+use tracing::{Level, event};
 use uuid::Uuid;
 
 #[cfg(not(target_os = "ios"))]
@@ -84,6 +85,11 @@ impl Accounts {
         0
     }
 
+    fn log_info(&self, file: &str, line: u32, msg: String) {
+        event!(Level::INFO, account_id = self.get_id(), "{msg}");
+        self.emit_event(EventType::Info(format!("{file}:{line}: {msg}")));
+    }
+
     /// Ensures the accounts directory and config file exist.
     /// Creates them if the directory doesn't exist, or if it exists but is empty.
     /// Errors if the directory exists with files but no config.

src/log.rs

@@ -2,7 +2,10 @@
 
 #![allow(missing_docs)]
 
+use tracing::{Level, event};
+
 use crate::context::Context;
+use crate::events::EventType;
 
 mod stream;
 
@@ -12,15 +15,9 @@ macro_rules! info {
     ($ctx:expr,  $msg:expr) => {
         info!($ctx, $msg,)
     };
-    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{
-        let formatted = format!($msg, $($args),*);
-        let full = format!("{file}:{line}: {msg}",
-                           file = file!(),
-                           line = line!(),
-                           msg = &formatted);
-        ::tracing::event!(::tracing::Level::INFO, account_id = $ctx.get_id(), "{}", &formatted);
-        $ctx.emit_event($crate::EventType::Info(full));
-    }};
+    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
+        $ctx.log_info(file!(), line!(), format!($msg, $($args),*))
+    };
 }
 
 // Workaround for <https://github.com/rust-lang/rust/issues/133708>.
@@ -30,15 +27,9 @@ mod warn_macro_mod {
         ($ctx:expr, $msg:expr) => {
             warn_macro!($ctx, $msg,)
         };
-        ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{
-            let formatted = format!($msg, $($args),*);
-            let full = format!("{file}:{line}: {msg}",
-                               file = file!(),
-                               line = line!(),
-                               msg = &formatted);
-            ::tracing::event!(::tracing::Level::WARN, account_id = $ctx.get_id(), "{}", &formatted);
-            $ctx.emit_event($crate::EventType::Warning(full));
-        }};
+        ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
+            $ctx.log_warn(file!(), line!(), format!($msg, $($args),*))
+        };
     }
 
     pub(crate) use warn_macro;
@@ -50,15 +41,28 @@ macro_rules! error {
     ($ctx:expr, $msg:expr) => {
         error!($ctx, $msg,)
     };
-    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{
-        let formatted = format!($msg, $($args),*);
-        ::tracing::event!(::tracing::Level::ERROR, account_id = $ctx.get_id(), "{}", &formatted);
-        $ctx.set_last_error(&formatted);
-        $ctx.emit_event($crate::EventType::Error(formatted));
-    }};
+    ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {
+        $ctx.log_error(format!($msg, $($args),*))
+    };
 }
 
 impl Context {
+    pub(crate) fn log_info(&self, file: &str, line: u32, msg: String) {
+        event!(Level::INFO, account_id = self.get_id(), "{msg}");
+        self.emit_event(EventType::Info(format!("{file}:{line}: {msg}")));
+    }
+
+    pub(crate) fn log_warn(&self, file: &str, line: u32, msg: String) {
+        event!(Level::WARN, account_id = self.get_id(), "{msg}");
+        self.emit_event(EventType::Warning(format!("{file}:{line}: {msg}")));
+    }
+
+    pub(crate) fn log_error(&self, msg: String) {
+        event!(Level::ERROR, account_id = self.get_id(), "{msg}");
+        self.set_last_error(&msg);
+        self.emit_event(EventType::Error(msg));
+    }
+
     /// Set last error string.
     /// Implemented as blocking as used from macros in different, not always async blocks.
     pub fn set_last_error(&self, error: &str) {