Add double curly braces to all macro_rules!, to ensure result is alwa…

…ys a block.
probe-rs · Dec 2, 2024 · 2f71e06 · 2f71e06
1 parent a46f878
commit 2f71e06
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/rtt-target/src/defmt.rs b/rtt-target/src/defmt.rs
@@ -80,7 +80,7 @@ fn do_write(bytes: &[u8]) {
 /// [`rtt_init`]: crate::rtt_init
 #[macro_export]
 macro_rules! rtt_init_defmt {
-    ($mode:path, $size:expr) => {
+    ($mode:path, $size:expr) => {{
         let channels = $crate::rtt_init! {
             up: {
                 0: {
@@ -92,14 +92,14 @@ macro_rules! rtt_init_defmt {
         };
 
         $crate::set_defmt_channel(channels.up.0);
-    };
+    }};
 
     ($mode:path) => {
         $crate::rtt_init_defmt!($mode, 1024);
     };
 
-    () => {
+    () => {{
         use $crate::ChannelMode::NoBlockSkip;
         $crate::rtt_init_defmt!(NoBlockSkip, 1024);
-    };
+    }};
 }
diff --git a/rtt-target/src/log.rs b/rtt-target/src/log.rs
@@ -88,10 +88,10 @@ unsafe fn init_racy(logger: &'static Logger) {
 /// [`rtt_init`]: crate::rtt_init
 #[macro_export]
 macro_rules! rtt_init_log {
-    ($level:path, $mode:path, $size:expr) => {
+    ($level:path, $mode:path, $size:expr) => {{
         $crate::rtt_init_print!($mode, $size);
         $crate::init_logger_with_level($level);
-    };
+    }};
 
     ($level:path, $mode:path) => {
         $crate::rtt_init_log!($level, $mode, 1024);

diff --git a/rtt-target/src/print.rs b/rtt-target/src/print.rs
@@ -160,7 +160,7 @@ macro_rules! rdbg {
 /// [`rtt_init`]: crate::rtt_init
 #[macro_export]
 macro_rules! rtt_init_print {
-    ($mode:path, $size:expr) => {
+    ($mode:path, $size:expr) => {{
         let channels = $crate::rtt_init! {
             up: {
                 0: {
@@ -172,14 +172,14 @@ macro_rules! rtt_init_print {
         };
 
         $crate::set_print_channel(channels.up.0);
-    };
+    }};
 
     ($mode:path) => {
         $crate::rtt_init_print!($mode, 1024);
     };
 
-    () => {
+    () => {{
         use $crate::ChannelMode::NoBlockSkip;
         $crate::rtt_init_print!(NoBlockSkip, 1024);
-    };
+    }};
 }