expand logger tests

KodrAus · KodrAus · commit 71e034ffa62b · 2025-03-24T05:45:35.000+10:00
diff --git a/tests/macros.rs b/tests/macros.rs
@@ -10,6 +10,7 @@ macro_rules! all_log_macros {
     });
 }
 
+// Not `Copy`
 struct Logger;
 
 impl Log for Logger {
@@ -22,15 +23,20 @@ impl Log for Logger {
 
 #[test]
 fn no_args() {
+    let logger = Logger;
+
     for lvl in log::Level::iter() {
         log!(lvl, "hello");
         log!(lvl, "hello",);
 
         log!(target: "my_target", lvl, "hello");
         log!(target: "my_target", lvl, "hello",);
 
-        log!(lvl, "hello");
-        log!(lvl, "hello",);
+        log!(logger: logger, lvl, "hello");
+        log!(logger: logger, lvl, "hello",);
+
+        log!(logger: logger, target: "my_target", lvl, "hello");
+        log!(logger: logger, target: "my_target", lvl, "hello",);
     }
 
     all_log_macros!("hello");
@@ -39,10 +45,11 @@ fn no_args() {
     all_log_macros!(target: "my_target", "hello");
     all_log_macros!(target: "my_target", "hello",);
 
-    all_log_macros!(logger: Logger, "hello");
-    all_log_macros!(logger: Logger, "hello",);
-    all_log_macros!(logger: Logger, target: "my_target", "hello");
-    all_log_macros!(logger: Logger, target: "my_target", "hello",);
+    all_log_macros!(logger: logger, "hello");
+    all_log_macros!(logger: logger, "hello",);
+
+    all_log_macros!(logger: logger, target: "my_target", "hello");
+    all_log_macros!(logger: logger, target: "my_target", "hello",);
 }
 
 #[test]
@@ -63,6 +70,14 @@ fn anonymous_args() {
 
     all_log_macros!(target: "my_target", "hello {}", "world");
     all_log_macros!(target: "my_target", "hello {}", "world",);
+
+    let logger = Logger;
+
+    all_log_macros!(logger: logger, "hello {}", "world");
+    all_log_macros!(logger: logger, "hello {}", "world",);
+
+    all_log_macros!(logger: logger, target: "my_target", "hello {}", "world");
+    all_log_macros!(logger: logger, target: "my_target", "hello {}", "world",);
 }
 
 #[test]
@@ -83,6 +98,14 @@ fn named_args() {
 
     all_log_macros!(target: "my_target", "hello {world}", world = "world");
     all_log_macros!(target: "my_target", "hello {world}", world = "world",);
+
+    let logger = Logger;
+
+    all_log_macros!(logger: logger, "hello {world}", world = "world");
+    all_log_macros!(logger: logger, "hello {world}", world = "world",);
+
+    all_log_macros!(logger: logger, target: "my_target", "hello {world}", world = "world");
+    all_log_macros!(logger: logger, target: "my_target", "hello {world}", world = "world",);
 }
 
 #[test]
@@ -105,81 +128,136 @@ fn inlined_args() {
 
     all_log_macros!(target: "my_target", "hello {world}");
     all_log_macros!(target: "my_target", "hello {world}",);
+
+    let logger = Logger;
+
+    all_log_macros!(logger: logger, "hello {world}");
+    all_log_macros!(logger: logger, "hello {world}",);
+
+    all_log_macros!(logger: logger, target: "my_target", "hello {world}");
+    all_log_macros!(logger: logger, target: "my_target", "hello {world}",);
 }
 
 #[test]
 fn enabled() {
+    let logger = Logger;
+
     for lvl in log::Level::iter() {
+        let _enabled = log_enabled!(lvl);
         let _enabled = log_enabled!(target: "my_target", lvl);
+        let _enabled = log_enabled!(logger: logger, target: "my_target", lvl);
+        let _enabled = log_enabled!(logger: logger, lvl);
     }
 }
 
 #[test]
 fn expr() {
+    let logger = Logger;
+
     for lvl in log::Level::iter() {
         log!(lvl, "hello");
+
+        log!(logger: logger, lvl, "hello");
     }
 }
 
 #[test]
 #[cfg(feature = "kv")]
 fn kv_no_args() {
+    let logger = Logger;
+
     for lvl in log::Level::iter() {
         log!(target: "my_target", lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
-
         log!(lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
+
+        log!(logger: logger, target: "my_target", lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
+        log!(logger: logger, lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
     }
 
-    all_log_macros!(logger: Logger, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
-    all_log_macros!(logger: Logger, target: "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
     all_log_macros!(target: "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
     all_log_macros!(target = "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
     all_log_macros!(cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
+
+    all_log_macros!(logger: logger, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
+    all_log_macros!(logger: logger, target: "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello");
 }
 
 #[test]
 #[cfg(feature = "kv")]
 fn kv_expr_args() {
+    let logger = Logger;
+
     for lvl in log::Level::iter() {
         log!(target: "my_target", lvl, cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
 
         log!(lvl, target = "my_target", cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
         log!(lvl, cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
+
+        log!(logger: logger, target: "my_target", lvl, cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
+
+        log!(logger: logger, lvl, target = "my_target", cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
+        log!(logger: logger, lvl, cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
     }
 
     all_log_macros!(target: "my_target", cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
     all_log_macros!(target = "my_target", cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
     all_log_macros!(cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
+
+    all_log_macros!(logger: logger, target: "my_target", cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
+    all_log_macros!(logger: logger, target = "my_target", cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
+    all_log_macros!(logger: logger, cat_math = { let mut x = 0; x += 1; x + 1 }; "hello");
 }
 
 #[test]
 #[cfg(feature = "kv")]
 fn kv_anonymous_args() {
+    let logger = Logger;
+
     for lvl in log::Level::iter() {
         log!(target: "my_target", lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
         log!(lvl, target = "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
 
         log!(lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
+
+        log!(logger: logger, target: "my_target", lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
+        log!(logger: logger, lvl, target = "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
+
+        log!(logger: logger, lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
     }
 
     all_log_macros!(target: "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
     all_log_macros!(target = "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
     all_log_macros!(cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
+
+    all_log_macros!(logger: logger, target: "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
+    all_log_macros!(logger: logger, target = "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
+    all_log_macros!(logger: logger, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {}", "world");
 }
 
 #[test]
 #[cfg(feature = "kv")]
 fn kv_named_args() {
+    let logger = Logger;
+
     for lvl in log::Level::iter() {
         log!(target: "my_target", lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
         log!(lvl, target = "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
 
         log!(lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
+
+        log!(logger: logger, target: "my_target", lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
+        log!(logger: logger, lvl, target = "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
+
+        log!(logger: logger, lvl, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
     }
 
     all_log_macros!(target: "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
     all_log_macros!(target = "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
     all_log_macros!(cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
+
+    all_log_macros!(logger: logger, target: "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
+    all_log_macros!(logger: logger, target = "my_target", cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
+    all_log_macros!(logger: logger, cat_1 = "chashu", cat_2 = "nori", cat_count = 2; "hello {world}", world = "world");
 }
 
 #[test]
@@ -323,6 +401,20 @@ fn kv_serde() {
     );
 }
 
+#[test]
+fn logger_short_lived() {
+    all_log_macros!(logger: Logger, "hello");
+    all_log_macros!(logger: &Logger, "hello");
+}
+
+#[test]
+fn logger_expr() {
+    all_log_macros!(logger: {
+        let logger = Logger;
+        logger
+    }, "hello");
+}
+
 /// Some and None (from Option) are used in the macros.
 #[derive(Debug)]
 enum Type {
