Support trailing comma in log macros (#187)

google · Jul 4, 2023 · feaaca3 · feaaca3
1 parent 1cee792
commit feaaca3
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 15 deletions.
diff --git a/crates/board/CHANGELOG.md b/crates/board/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Patch
 
 - Fix `WithSerial` helper to flush all data
+- Update dependencies
 
 ## 0.3.0
 

diff --git a/crates/board/Cargo.lock b/crates/board/Cargo.lock
diff --git a/crates/board/Cargo.toml b/crates/board/Cargo.toml
@@ -34,7 +34,7 @@ signature = { version = "2.1.0", default-features = false, optional = true }
 typenum = { version = "1.16.0", default-features = false }
 usb-device = { version = "0.2.9", default-features = false }
 usbd-serial = { version = "0.1.1", default-features = false }
-wasefire-logger = { version = "0.1.2", path = "../logger" }
+wasefire-logger = { version = "0.1.3-git", path = "../logger" }
 wasefire-store = { version = "0.2.0", path = "../store" }
 
 [features]

diff --git a/crates/logger/CHANGELOG.md b/crates/logger/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.1.3-git
+
+### Patch
+
+- Support trailing comma when neither `log` nor `defmt` is used
+
 ## 0.1.2
 
 ### Patch

diff --git a/crates/logger/Cargo.lock b/crates/logger/Cargo.lock
diff --git a/crates/logger/Cargo.toml b/crates/logger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasefire-logger"
-version = "0.1.2"
+version = "0.1.3-git"
 authors = ["Julien Cretin <cretin@google.com>"]
 license = "Apache-2.0"
 publish = true

diff --git a/crates/logger/src/lib.rs b/crates/logger/src/lib.rs
@@ -37,32 +37,32 @@ mod no_defmt {
 mod custom {
     #[macro_export]
     macro_rules! println {
-        ($($args: expr),*) => { if false { $(let _ = $args;)* } };
+        ($($args: expr),*$(,)?) => { if false { $(let _ = $args;)* } };
     }
 
     #[macro_export]
     macro_rules! trace {
-        ($($args: expr),*) => { if false { $(let _ = $args;)* } };
+        ($($args: expr),*$(,)?) => { if false { $(let _ = $args;)* } };
     }
 
     #[macro_export]
     macro_rules! debug {
-        ($($args: expr),*) => { if false { $(let _ = $args;)* } };
+        ($($args: expr),*$(,)?) => { if false { $(let _ = $args;)* } };
     }
 
     #[macro_export]
     macro_rules! info {
-        ($($args: expr),*) => { if false { $(let _ = $args;)* } };
+        ($($args: expr),*$(,)?) => { if false { $(let _ = $args;)* } };
     }
 
     #[macro_export]
     macro_rules! warn {
-        ($($args: expr),*) => { if false { $(let _ = $args;)* } };
+        ($($args: expr),*$(,)?) => { if false { $(let _ = $args;)* } };
     }
 
     #[macro_export]
     macro_rules! error {
-        ($($args: expr),*) => { if false { $(let _ = $args;)* } };
+        ($($args: expr),*$(,)?) => { if false { $(let _ = $args;)* } };
     }
 }
 

diff --git a/crates/runner-host/Cargo.lock b/crates/runner-host/Cargo.lock
diff --git a/crates/runner-nordic/Cargo.lock b/crates/runner-nordic/Cargo.lock
diff --git a/crates/scheduler/CHANGELOG.md b/crates/scheduler/CHANGELOG.md
@@ -42,4 +42,4 @@
 
 ## 0.1.0
 
-<!-- Increment to skip CHANGELOG.md test: 9 -->
+<!-- Increment to skip CHANGELOG.md test: 10 -->
diff --git a/crates/scheduler/Cargo.lock b/crates/scheduler/Cargo.lock
diff --git a/crates/scheduler/Cargo.toml b/crates/scheduler/Cargo.toml
@@ -20,7 +20,7 @@ typenum = { version = "1.16.0", default-features = false }
 wasefire-applet-api = { version = "0.3.0", path = "../api", features = ["host"] }
 wasefire-board-api = { version = "0.3.1-git", path = "../board" }
 wasefire-interpreter = { version = "0.1.2", path = "../interpreter", features = ["toctou"] }
-wasefire-logger = { version = "0.1.2", path = "../logger" }
+wasefire-logger = { version = "0.1.3-git", path = "../logger" }
 wasefire-store = { version = "0.2.0", path = "../store" }
 
 [features]