simplify dot cases

guswynn · Jan 13, 2022 · 7f9aee9 · 7f9aee9
1 parent 9b09230
commit 7f9aee9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/tracing/src/macros.rs b/tracing/src/macros.rs
@@ -846,27 +846,20 @@ macro_rules! enabled {
     );
 
     // These two cases handle fields with no values
-    (target: $target:expr, $lvl:expr, $($k:ident).+) => (
-        $crate::enabled!(target: $target, $lvl, $($k).+,)
-    );
-    (target: $target:expr, $lvl:expr, $($k:ident).+, $($field:tt)*) => (
+    (target: $target:expr, $lvl:expr, $($field:tt)*) => (
         $crate::enabled!(
             target: $target,
             $lvl,
-            { $($k).+, $($field)*}
+            { $($field)*}
         )
     );
-
-    ($lvl:expr, $($k:ident).+, $($field:tt)*) => (
+    ($lvl:expr, $($field:tt)*) => (
         $crate::enabled!(
             target: module_path!(),
             $lvl,
-            { $($k).+, $($field)*}
+            { $($field)*}
         )
     );
-    ($lvl:expr, $($k:ident).+) => (
-        $crate::enabled!($lvl, $($k).+,)
-    );
 
     // Simplest `enabled!` case
     ( $lvl:expr ) => (

diff --git a/tracing/tests/macros.rs b/tracing/tests/macros.rs
@@ -339,7 +339,8 @@ fn event() {
 fn enabled() {
     enabled!(Level::DEBUG, foo, bar.baz, quux,);
     enabled!(Level::DEBUG, message);
-    enabled!(Level::INFO, foo, bar.baz, quux, messaged,);
+    enabled!(Level::INFO, foo, bar.baz, quux, message,);
+    enabled!(Level::INFO, foo, bar., message,);
     enabled!(Level::DEBUG, foo);
 
     enabled!(Level::DEBUG);