aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2021-03-17 22:50:27 +0100
committerDario Nieuwenhuis <[email protected]>2021-03-17 22:50:27 +0100
commita9076636ac5e5396aea0e450b8af591b709640a2 (patch)
treeb0a8b79daff7ab19599261258e04edb95ef535cb
parentf14361835fb81726d71ac85f0f562ede8c1a6472 (diff)
Do not export fmt macros.
This was introduced by accident by me struggling with the weird intra-crate macro importing system...
-rw-r--r--embassy-extras/src/fmt.rs6
-rw-r--r--embassy-nrf/src/fmt.rs6
-rw-r--r--embassy-stm32f4/src/fmt.rs6
-rw-r--r--embassy/src/fmt.rs6
4 files changed, 0 insertions, 24 deletions
diff --git a/embassy-extras/src/fmt.rs b/embassy-extras/src/fmt.rs
index 1be1057a7..fc1855ed1 100644
--- a/embassy-extras/src/fmt.rs
+++ b/embassy-extras/src/fmt.rs
@@ -32,35 +32,30 @@ mod fmt {
32 unreachable, 32 unreachable,
33 }; 33 };
34 34
35 #[macro_export]
36 macro_rules! trace { 35 macro_rules! trace {
37 ($($msg:expr),+ $(,)?) => { 36 ($($msg:expr),+ $(,)?) => {
38 () 37 ()
39 }; 38 };
40 } 39 }
41 40
42 #[macro_export]
43 macro_rules! debug { 41 macro_rules! debug {
44 ($($msg:expr),+ $(,)?) => { 42 ($($msg:expr),+ $(,)?) => {
45 () 43 ()
46 }; 44 };
47 } 45 }
48 46
49 #[macro_export]
50 macro_rules! info { 47 macro_rules! info {
51 ($($msg:expr),+ $(,)?) => { 48 ($($msg:expr),+ $(,)?) => {
52 () 49 ()
53 }; 50 };
54 } 51 }
55 52
56 #[macro_export]
57 macro_rules! warn { 53 macro_rules! warn {
58 ($($msg:expr),+ $(,)?) => { 54 ($($msg:expr),+ $(,)?) => {
59 () 55 ()
60 }; 56 };
61 } 57 }
62 58
63 #[macro_export]
64 macro_rules! error { 59 macro_rules! error {
65 ($($msg:expr),+ $(,)?) => { 60 ($($msg:expr),+ $(,)?) => {
66 () 61 ()
@@ -69,7 +64,6 @@ mod fmt {
69} 64}
70 65
71#[cfg(not(feature = "defmt"))] 66#[cfg(not(feature = "defmt"))]
72#[macro_export]
73macro_rules! unwrap { 67macro_rules! unwrap {
74 ($arg:expr) => { 68 ($arg:expr) => {
75 match $crate::fmt::Try::into_result($arg) { 69 match $crate::fmt::Try::into_result($arg) {
diff --git a/embassy-nrf/src/fmt.rs b/embassy-nrf/src/fmt.rs
index 1be1057a7..fc1855ed1 100644
--- a/embassy-nrf/src/fmt.rs
+++ b/embassy-nrf/src/fmt.rs
@@ -32,35 +32,30 @@ mod fmt {
32 unreachable, 32 unreachable,
33 }; 33 };
34 34
35 #[macro_export]
36 macro_rules! trace { 35 macro_rules! trace {
37 ($($msg:expr),+ $(,)?) => { 36 ($($msg:expr),+ $(,)?) => {
38 () 37 ()
39 }; 38 };
40 } 39 }
41 40
42 #[macro_export]
43 macro_rules! debug { 41 macro_rules! debug {
44 ($($msg:expr),+ $(,)?) => { 42 ($($msg:expr),+ $(,)?) => {
45 () 43 ()
46 }; 44 };
47 } 45 }
48 46
49 #[macro_export]
50 macro_rules! info { 47 macro_rules! info {
51 ($($msg:expr),+ $(,)?) => { 48 ($($msg:expr),+ $(,)?) => {
52 () 49 ()
53 }; 50 };
54 } 51 }
55 52
56 #[macro_export]
57 macro_rules! warn { 53 macro_rules! warn {
58 ($($msg:expr),+ $(,)?) => { 54 ($($msg:expr),+ $(,)?) => {
59 () 55 ()
60 }; 56 };
61 } 57 }
62 58
63 #[macro_export]
64 macro_rules! error { 59 macro_rules! error {
65 ($($msg:expr),+ $(,)?) => { 60 ($($msg:expr),+ $(,)?) => {
66 () 61 ()
@@ -69,7 +64,6 @@ mod fmt {
69} 64}
70 65
71#[cfg(not(feature = "defmt"))] 66#[cfg(not(feature = "defmt"))]
72#[macro_export]
73macro_rules! unwrap { 67macro_rules! unwrap {
74 ($arg:expr) => { 68 ($arg:expr) => {
75 match $crate::fmt::Try::into_result($arg) { 69 match $crate::fmt::Try::into_result($arg) {
diff --git a/embassy-stm32f4/src/fmt.rs b/embassy-stm32f4/src/fmt.rs
index 1be1057a7..fc1855ed1 100644
--- a/embassy-stm32f4/src/fmt.rs
+++ b/embassy-stm32f4/src/fmt.rs
@@ -32,35 +32,30 @@ mod fmt {
32 unreachable, 32 unreachable,
33 }; 33 };
34 34
35 #[macro_export]
36 macro_rules! trace { 35 macro_rules! trace {
37 ($($msg:expr),+ $(,)?) => { 36 ($($msg:expr),+ $(,)?) => {
38 () 37 ()
39 }; 38 };
40 } 39 }
41 40
42 #[macro_export]
43 macro_rules! debug { 41 macro_rules! debug {
44 ($($msg:expr),+ $(,)?) => { 42 ($($msg:expr),+ $(,)?) => {
45 () 43 ()
46 }; 44 };
47 } 45 }
48 46
49 #[macro_export]
50 macro_rules! info { 47 macro_rules! info {
51 ($($msg:expr),+ $(,)?) => { 48 ($($msg:expr),+ $(,)?) => {
52 () 49 ()
53 }; 50 };
54 } 51 }
55 52
56 #[macro_export]
57 macro_rules! warn { 53 macro_rules! warn {
58 ($($msg:expr),+ $(,)?) => { 54 ($($msg:expr),+ $(,)?) => {
59 () 55 ()
60 }; 56 };
61 } 57 }
62 58
63 #[macro_export]
64 macro_rules! error { 59 macro_rules! error {
65 ($($msg:expr),+ $(,)?) => { 60 ($($msg:expr),+ $(,)?) => {
66 () 61 ()
@@ -69,7 +64,6 @@ mod fmt {
69} 64}
70 65
71#[cfg(not(feature = "defmt"))] 66#[cfg(not(feature = "defmt"))]
72#[macro_export]
73macro_rules! unwrap { 67macro_rules! unwrap {
74 ($arg:expr) => { 68 ($arg:expr) => {
75 match $crate::fmt::Try::into_result($arg) { 69 match $crate::fmt::Try::into_result($arg) {
diff --git a/embassy/src/fmt.rs b/embassy/src/fmt.rs
index 1be1057a7..fc1855ed1 100644
--- a/embassy/src/fmt.rs
+++ b/embassy/src/fmt.rs
@@ -32,35 +32,30 @@ mod fmt {
32 unreachable, 32 unreachable,
33 }; 33 };
34 34
35 #[macro_export]
36 macro_rules! trace { 35 macro_rules! trace {
37 ($($msg:expr),+ $(,)?) => { 36 ($($msg:expr),+ $(,)?) => {
38 () 37 ()
39 }; 38 };
40 } 39 }
41 40
42 #[macro_export]
43 macro_rules! debug { 41 macro_rules! debug {
44 ($($msg:expr),+ $(,)?) => { 42 ($($msg:expr),+ $(,)?) => {
45 () 43 ()
46 }; 44 };
47 } 45 }
48 46
49 #[macro_export]
50 macro_rules! info { 47 macro_rules! info {
51 ($($msg:expr),+ $(,)?) => { 48 ($($msg:expr),+ $(,)?) => {
52 () 49 ()
53 }; 50 };
54 } 51 }
55 52
56 #[macro_export]
57 macro_rules! warn { 53 macro_rules! warn {
58 ($($msg:expr),+ $(,)?) => { 54 ($($msg:expr),+ $(,)?) => {
59 () 55 ()
60 }; 56 };
61 } 57 }
62 58
63 #[macro_export]
64 macro_rules! error { 59 macro_rules! error {
65 ($($msg:expr),+ $(,)?) => { 60 ($($msg:expr),+ $(,)?) => {
66 () 61 ()
@@ -69,7 +64,6 @@ mod fmt {
69} 64}
70 65
71#[cfg(not(feature = "defmt"))] 66#[cfg(not(feature = "defmt"))]
72#[macro_export]
73macro_rules! unwrap { 67macro_rules! unwrap {
74 ($arg:expr) => { 68 ($arg:expr) => {
75 match $crate::fmt::Try::into_result($arg) { 69 match $crate::fmt::Try::into_result($arg) {