From 5e8608c7a5b1e4e92f1fb650ea0ef47e5a6df563 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Sun, 1 Nov 2020 17:17:24 +0100
Subject: Make defmt optional with new `anyfmt` crate

---
 examples/src/example_common.rs | 51 +-----------------------------------------
 1 file changed, 1 insertion(+), 50 deletions(-)

(limited to 'examples/src/example_common.rs')

diff --git a/examples/src/example_common.rs b/examples/src/example_common.rs
index 65bfe6bb1..1a12fa69a 100644
--- a/examples/src/example_common.rs
+++ b/examples/src/example_common.rs
@@ -4,7 +4,7 @@ use defmt_rtt as _; // global logger
 use nrf52840_hal as _;
 use panic_probe as _;
 
-pub use defmt::{info, intern};
+pub use anyfmt::*;
 
 use core::sync::atomic::{AtomicUsize, Ordering};
 
@@ -16,52 +16,3 @@ fn timestamp() -> u64 {
     COUNT.store(n + 1, Ordering::Relaxed);
     n as u64
 }
-
-macro_rules! depanic {
-    ($( $i:expr ),*) => {
-        {
-            defmt::error!($( $i ),*);
-            panic!();
-        }
-    }
-}
-
-pub trait Dewrap<T> {
-    /// dewrap = defmt unwrap
-    fn dewrap(self) -> T;
-
-    /// dexpect = defmt expect
-    fn dexpect<M: defmt::Format>(self, msg: M) -> T;
-}
-
-impl<T> Dewrap<T> for Option<T> {
-    fn dewrap(self) -> T {
-        match self {
-            Some(t) => t,
-            None => depanic!("Dewrap failed: enum is none"),
-        }
-    }
-
-    fn dexpect<M: defmt::Format>(self, msg: M) -> T {
-        match self {
-            Some(t) => t,
-            None => depanic!("Unexpected None: {:?}", msg),
-        }
-    }
-}
-
-impl<T, E: defmt::Format> Dewrap<T> for Result<T, E> {
-    fn dewrap(self) -> T {
-        match self {
-            Ok(t) => t,
-            Err(e) => depanic!("Dewrap failed: {:?}", e),
-        }
-    }
-
-    fn dexpect<M: defmt::Format>(self, msg: M) -> T {
-        match self {
-            Ok(t) => t,
-            Err(e) => depanic!("Unexpected error: {:?}: {:?}", msg, e),
-        }
-    }
-}
-- 
cgit