Merge pull request #3193 from taaki2311/main

Reduced the definition for 'unreachable!' to a single macro rule

cyw43/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-boot-nrf/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-boot-rp/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-boot-stm32/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-boot/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-executor/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-futures/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-hal-internal/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-net-adin1110/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-net-driver-channel/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-net-enc28j60/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-net-esp-hosted/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-net-ppp/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-net/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-nrf/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-rp/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-stm32-wpan/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-stm32/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-sync/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-time/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-usb-dfu/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-usb-synopsys-otg/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }
 

embassy-usb/src/fmt.rs

@@ -90,19 +90,15 @@ macro_rules! todo {
     };
 }
 
-#[cfg(not(feature = "defmt"))]
 #[collapse_debuginfo(yes)]
 macro_rules! unreachable {
     ($($x:tt)*) => {
-        ::core::unreachable!($($x)*)
+        {
-    };
+            #[cfg(not(feature = "defmt"))]
-}
+            ::core::unreachable!($($x)*);
-
+            #[cfg(feature = "defmt")]
-#[cfg(feature = "defmt")]
+            ::defmt::unreachable!($($x)*);
-#[collapse_debuginfo(yes)]
+        }
-macro_rules! unreachable {
-    ($($x:tt)*) => {
-        ::defmt::unreachable!($($x)*)
     };
 }