From de161d1a6dbc8d42c104df8854ccf740b5fb1932 Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Sat, 18 May 2024 20:37:32 +0800 Subject: [PATCH] Don't use defmt Compatibility with `log` is a hassle, rtt-logger should work instead (not done yet) --- Cargo.lock | 110 ++++--------------------- Cargo.toml | 3 - embassy/Cargo.toml | 4 - embassy/demos/common/Cargo.toml | 7 +- embassy/demos/common/src/config.rs | 5 -- embassy/demos/common/src/server.rs | 12 +-- embassy/demos/common/src/takepipe.rs | 9 +- embassy/demos/picow/Cargo.toml | 17 ++-- embassy/demos/picow/build.rs | 1 - embassy/demos/picow/src/flashconfig.rs | 8 +- embassy/demos/picow/src/keyboard.rs | 5 -- embassy/demos/picow/src/main.rs | 7 +- embassy/demos/picow/src/picowmenu.rs | 5 -- embassy/demos/picow/src/serial.rs | 5 -- embassy/demos/picow/src/usb.rs | 5 -- embassy/demos/picow/src/w5500.rs | 5 -- embassy/demos/picow/src/wifi.rs | 9 +- embassy/demos/std/Cargo.toml | 2 +- embassy/src/embassy_sunset.rs | 5 -- src/prelude.rs | 11 --- 20 files changed, 28 insertions(+), 207 deletions(-) delete mode 100644 src/prelude.rs diff --git a/Cargo.lock b/Cargo.lock index d2b7205..d9cbf7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,7 +201,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" dependencies = [ - "critical-section 1.1.2", + "critical-section", ] [[package]] @@ -252,12 +252,6 @@ dependencies = [ "rustc_version 0.2.3", ] -[[package]] -name = "bare-metal" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603" - [[package]] name = "base16ct" version = "0.2.0" @@ -370,7 +364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c46a75c3f97a6ad5d831f7f5376e9853161bfeedc4fb90f271261bd7c9888e" dependencies = [ "cortex-m", - "critical-section 1.1.2", + "critical-section", "embassy-rp", "getrandom", "log", @@ -454,9 +448,9 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ec610d8f49840a5b376c69663b6369e71f4b34484b9b2eb29fb918d92516cb9" dependencies = [ - "bare-metal 0.2.5", + "bare-metal", "bitfield", - "critical-section 1.1.2", + "critical-section", "embedded-hal 0.2.7", "volatile-register", ] @@ -499,16 +493,6 @@ dependencies = [ "debug-helper", ] -[[package]] -name = "critical-section" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1706d332edc22aef4d9f23a6bb1c92360a403013c291af51247a737472dcae6" -dependencies = [ - "bare-metal 1.0.0", - "critical-section 1.1.2", -] - [[package]] name = "critical-section" version = "1.1.2" @@ -594,7 +578,6 @@ checksum = "59d6ec798758febb089bd969109385b48dd0fb966193fe97a5f0f8b2d622145e" dependencies = [ "cortex-m", "cortex-m-rt", - "defmt", "embassy-futures", "embassy-net-driver-channel", "embassy-sync 0.5.0", @@ -658,48 +641,6 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" -[[package]] -name = "defmt" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2d011b2fee29fb7d659b83c43fce9a2cb4df453e16d441a51448e448f3f98" -dependencies = [ - "bitflags 1.3.2", - "defmt-macros", -] - -[[package]] -name = "defmt-macros" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54f0216f6c5acb5ae1a47050a6645024e6edafc2ee32d421955eccfef12ef92e" -dependencies = [ - "defmt-parser", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "defmt-parser" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269924c02afd7f94bc4cecbfa5c379f6ffcf9766b3408fe63d22c728654eccd0" -dependencies = [ - "thiserror", -] - -[[package]] -name = "defmt-rtt" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2cbbbd58847d508d97629b32cd9730a2d28532f71e219714614406029f18b1" -dependencies = [ - "critical-section 0.2.8", - "defmt", -] - [[package]] name = "der" version = "0.7.8" @@ -853,8 +794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec648daedd2143466eff4b3e8002024f9f6c1de4ab7666bb679688752624c925" dependencies = [ "cortex-m", - "critical-section 1.1.2", - "defmt", + "critical-section", "document-features", "embassy-executor-macros", "embassy-time-driver", @@ -887,8 +827,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0ec47cf8bab914018d4bd2b4f0aaeb46e4f52ab1e7985df88aeef2c6eda5aed" dependencies = [ "cortex-m", - "critical-section 1.1.2", - "defmt", + "critical-section", "num-traits", ] @@ -900,7 +839,6 @@ checksum = "55cf91dd36dfd623de32242af711fd294d41159f02130052fc93c5c5ba93febe" dependencies = [ "as-slice 0.2.1", "atomic-pool", - "defmt", "document-features", "embassy-net-driver", "embassy-sync 0.5.0", @@ -921,9 +859,6 @@ name = "embassy-net-driver" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524eb3c489760508f71360112bca70f6e53173e6fe48fc5f0efd0f5ab217751d" -dependencies = [ - "defmt", -] [[package]] name = "embassy-net-driver-channel" @@ -971,8 +906,7 @@ dependencies = [ "cfg-if", "cortex-m", "cortex-m-rt", - "critical-section 1.1.2", - "defmt", + "critical-section", "document-features", "embassy-embedded-hal", "embassy-futures", @@ -1006,7 +940,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0525b466ca3ace30b57f2db868a35215dfaecd038d8668cb2db03feb7c069a0" dependencies = [ "cfg-if", - "critical-section 1.1.2", + "critical-section", "futures-util", "heapless 0.7.17", ] @@ -1018,7 +952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd938f25c0798db4280fcd8026bf4c2f48789aebf8f77b6e5cf8a7693ba114ec" dependencies = [ "cfg-if", - "critical-section 1.1.2", + "critical-section", "embedded-io-async", "futures-util", "heapless 0.8.0", @@ -1031,8 +965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9c844070d9f80dc66ee739299183312baee2e1cdeb6e90b4ea2af44f4676da5" dependencies = [ "cfg-if", - "critical-section 1.1.2", - "defmt", + "critical-section", "document-features", "embassy-time-driver", "embassy-time-queue-driver", @@ -1079,9 +1012,6 @@ name = "embassy-usb-driver" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fc247028eae04174b6635104a35b1ed336aabef4654f5e87a8f32327d231970" -dependencies = [ - "defmt", -] [[package]] name = "embedded-hal" @@ -1114,7 +1044,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57b4e6ede84339ebdb418cd986e6320a34b017cdf99b5cc3efceec6450b06886" dependencies = [ - "critical-section 1.1.2", + "critical-section", "embedded-hal 1.0.0", "embedded-hal-async", ] @@ -1134,9 +1064,6 @@ name = "embedded-io" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" -dependencies = [ - "defmt", -] [[package]] name = "embedded-io-adapters" @@ -1155,7 +1082,6 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" dependencies = [ - "defmt", "embedded-io", ] @@ -1517,7 +1443,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "defmt", "hash32 0.3.1", "stable_deref_trait", ] @@ -1966,7 +1891,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa6fa5645ef5a760cd340eaa92af9c1ce131c8c09e7f8926d8a24b59d26652b9" dependencies = [ "cortex-m", - "defmt", ] [[package]] @@ -2144,7 +2068,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" dependencies = [ - "critical-section 1.1.2", + "critical-section", ] [[package]] @@ -2566,7 +2490,6 @@ dependencies = [ "bitflags 1.3.2", "byteorder", "cfg-if", - "defmt", "heapless 0.8.0", "managed", ] @@ -2741,7 +2664,6 @@ dependencies = [ "cipher", "ctr", "curve25519-dalek", - "defmt", "digest", "ed25519-dalek", "embedded-io", @@ -2799,7 +2721,6 @@ version = "0.1.0" dependencies = [ "anyhow", "bcrypt", - "defmt", "ed25519-dalek", "embassy-futures", "embassy-net", @@ -2826,11 +2747,9 @@ dependencies = [ "caprand", "cortex-m", "cortex-m-rt", - "critical-section 1.1.2", + "critical-section", "cyw43", "cyw43-pio", - "defmt", - "defmt-rtt", "embassy-executor", "embassy-futures", "embassy-net", @@ -2869,7 +2788,7 @@ version = "0.1.0" dependencies = [ "async-io", "atomic-polyfill", - "critical-section 1.1.2", + "critical-section", "embassy-executor", "embassy-futures", "embassy-net", @@ -2893,7 +2812,6 @@ name = "sunset-embassy" version = "0.2.0" dependencies = [ "atomic-polyfill", - "defmt", "embassy-futures", "embassy-sync 0.5.0", "embedded-io-async", diff --git a/Cargo.toml b/Cargo.toml index 2796f54..8a1f77f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,8 +61,6 @@ pretty-hex = { version = "0.4", default-features = false } # for non_async futures = { version = "0.3", default-features = false } -defmt = { version = "0.3", optional = true } - [features] std = ["snafu/std", "snafu/backtrace", "ssh-key/alloc", "larger"] rsa = ["dep:rsa", "ssh-key/rsa"] @@ -70,7 +68,6 @@ rsa = ["dep:rsa", "ssh-key/rsa"] openssh-key = ["ssh-key"] # implements embedded_io::Error for sunset::Error embedded-io = ["dep:embedded-io"] -defmt = ["dep:defmt"] # Allocate larger buffers for things such as usernames. # See config.rs for details diff --git a/embassy/Cargo.toml b/embassy/Cargo.toml index 56348ec..02d3534 100644 --- a/embassy/Cargo.toml +++ b/embassy/Cargo.toml @@ -18,11 +18,7 @@ sunset = { version = "0.2.0", path = "../", features = ["embedded-io"] } log = { version = "0.4" } -defmt = { version = "0.3", optional = true } - [features] -defmt = ["dep:defmt"] - # Remove any use of `unsafe`. This currently requires # nightly and -Zpolonius (not ready yet) try-polonius = [] diff --git a/embassy/demos/common/Cargo.toml b/embassy/demos/common/Cargo.toml index 00b17c2..7ab437c 100644 --- a/embassy/demos/common/Cargo.toml +++ b/embassy/demos/common/Cargo.toml @@ -10,7 +10,7 @@ sunset = { path = "../../.." } sunset-sshwire-derive = { path = "../../../sshwire-derive" } embassy-sync = { version = "0.5" } -embassy-net = { version = "0.4", features = ["tcp", "dhcpv4", "medium-ethernet"] } +embassy-net = { version = "0.4", features = ["tcp", "dhcpv4", "medium-ethernet", "log"] } embassy-net-driver = { version = "0.2" } embassy-futures = { version = "0.1" } embassy-time = { version = "0.3" } @@ -24,7 +24,6 @@ hmac = { version = "0.12", default-features = false } bcrypt = { version = "0.15", default-features = false } ed25519-dalek = { version = "2.0.0-rc.2", default-features = false } -defmt = { version = "0.3", optional = true } log = "0.4" pretty-hex = { version = "0.4", default-features = false } @@ -32,7 +31,3 @@ pretty-hex = { version = "0.4", default-features = false } anyhow = { version = "1.0" } sunset = { path = "../../..", features = ["std"] } tokio = { version = "1.25", features = ["full"] } - -[features] -defmt = ["dep:defmt", "embedded-io-async/defmt-03", "embassy-net/defmt"] -log = ["embassy-net/log"] diff --git a/embassy/demos/common/src/config.rs b/embassy/demos/common/src/config.rs index 1730dc1..d54db5c 100644 --- a/embassy/demos/common/src/config.rs +++ b/embassy/demos/common/src/config.rs @@ -2,13 +2,8 @@ use sunset::error::{Error, Result, TrapBug}; #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] use log::{debug, error, info, log, trace, warn}; -#[allow(unused)] -#[cfg(feature = "defmt")] -use defmt::{debug, error, info, panic, trace, warn}; - use hmac::{Hmac, Mac}; use sha2::Sha256; diff --git a/embassy/demos/common/src/server.rs b/embassy/demos/common/src/server.rs index 23b1ab9..607f473 100644 --- a/embassy/demos/common/src/server.rs +++ b/embassy/demos/common/src/server.rs @@ -1,13 +1,6 @@ //! Shared between `picow` and `std` Embassy demos #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] -use { - log::{debug, error, info, log, trace, warn}, -}; - -#[allow(unused)] -#[cfg(feature = "defmt")] -use defmt::{debug, info, warn, panic, error, trace}; +use log::{debug, error, info, log, trace, warn}; use embassy_sync::mutex::Mutex; use embassy_sync::blocking_mutex::raw::NoopRawMutex; @@ -49,8 +42,7 @@ pub async fn listener(stack: &'static Stack, let r = session::(&mut socket, &config, &init).await; if let Err(e) = r { - // TODO defmt errors - warn!("Ended with error {e:?}"); + warn!("Ended with error {e:#?}"); } // Make sure a TCP socket reset is sent to the remote host diff --git a/embassy/demos/common/src/takepipe.rs b/embassy/demos/common/src/takepipe.rs index 2abc743..a179928 100644 --- a/embassy/demos/common/src/takepipe.rs +++ b/embassy/demos/common/src/takepipe.rs @@ -1,12 +1,5 @@ #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] -pub use { - log::{debug, error, info, log, trace, warn}, -}; - -#[allow(unused_imports)] -#[cfg(feature = "defmt")] -pub use defmt::{debug, info, warn, panic, error, trace}; +use log::{debug, error, info, log, trace, warn}; use core::ops::DerefMut; diff --git a/embassy/demos/picow/Cargo.toml b/embassy/demos/picow/Cargo.toml index 5a8e544..ffb8050 100644 --- a/embassy/demos/picow/Cargo.toml +++ b/embassy/demos/picow/Cargo.toml @@ -9,16 +9,14 @@ sunset = { path = "../../.." } sunset-sshwire-derive = { path = "../../../sshwire-derive" } sunset-demo-embassy-common= { path = "../common" } -cyw43 = { version = "0.1.0", optional = true, features = ["defmt"] } +cyw43 = { version = "0.1.0", optional = true} cyw43-pio = { version = "0.1.0", optional = true } -# cyw43 = { path = "/home/matt/3rd/rs/cyw43", features = ["defmt"] } -# cyw43-pio = { path = "/home/matt/3rd/rs/cyw43/cyw43-pio" } embassy-net-wiznet = { version = "0.1.0", optional = true } -embassy-executor = { version = "0.5", features = ["defmt", "integrated-timers", "executor-thread", "arch-cortex-m"] } -embassy-time = { version = "0.3", features = ["defmt", "defmt-timestamp-uptime"] } -embassy-rp = { version = "0.1", features = ["defmt", "unstable-pac", "time-driver"] } +embassy-executor = { version = "0.5", features = ["integrated-timers", "executor-thread", "arch-cortex-m"] } +embassy-time = { version = "0.3", features = [] } +embassy-rp = { version = "0.1", features = ["unstable-pac", "time-driver"] } embassy-net = { version = "0.4", features = ["tcp", "dhcpv4", "medium-ethernet"] } embassy-net-driver = { version = "0.2" } embassy-usb-driver = { version = "0.1" } @@ -28,9 +26,7 @@ embassy-usb = { version = "0.1" } atomic-polyfill = "1.0" static_cell = { version = "1.0", features = [ "nightly" ] } -defmt = { version = "0.3", optional = true } -defmt-rtt = "0.3" -panic-probe = { version = "0.3", features = ["print-defmt"] } +panic-probe = { version = "0.3", features = [] } pretty-hex = { version = "0.4", default-features = false } log = { version = "0.4" } futures = { version = "0.3", default-features = false } @@ -57,8 +53,7 @@ sha2 = { version = "0.10", default-features = false } usbd-hid = "0.6" [features] -default = ["cyw43", "defmt", "sunset-demo-embassy-common/defmt" ] -defmt = ["dep:defmt", "sunset/defmt", "sunset-embassy/defmt"] +default = ["cyw43"] # for pico w board cyw43 = ["dep:cyw43", "dep:cyw43-pio"] diff --git a/embassy/demos/picow/build.rs b/embassy/demos/picow/build.rs index b51424e..2bb830a 100644 --- a/embassy/demos/picow/build.rs +++ b/embassy/demos/picow/build.rs @@ -38,7 +38,6 @@ fn link() { println!("cargo:rustc-link-arg-bins=--nmagic"); println!("cargo:rustc-link-arg-bins=-Tlink.x"); println!("cargo:rustc-link-arg-bins=-Tlink-rp.x"); - println!("cargo:rustc-link-arg-bins=-Tdefmt.x"); } fn git() { diff --git a/embassy/demos/picow/src/flashconfig.rs b/embassy/demos/picow/src/flashconfig.rs index 3a8db08..1c2cd4a 100644 --- a/embassy/demos/picow/src/flashconfig.rs +++ b/embassy/demos/picow/src/flashconfig.rs @@ -3,14 +3,8 @@ use { sunset::error::{Error, Result, TrapBug}, }; -#[cfg(not(feature = "defmt"))] -pub use { - log::{debug, error, info, log, trace, warn}, -}; - #[allow(unused_imports)] -#[cfg(feature = "defmt")] -pub use defmt::{debug, info, warn, panic, error, trace}; +use log::{debug, error, info, log, trace, warn}; use embassy_rp::flash::{Flash, Async, ERASE_SIZE}; use embassy_rp::peripherals::FLASH; diff --git a/embassy/demos/picow/src/keyboard.rs b/embassy/demos/picow/src/keyboard.rs index 6e11df9..e65c3e3 100644 --- a/embassy/demos/picow/src/keyboard.rs +++ b/embassy/demos/picow/src/keyboard.rs @@ -1,11 +1,6 @@ #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] pub use log::{debug, error, info, log, trace, warn}; -#[allow(unused_imports)] -#[cfg(feature = "defmt")] -pub use defmt::{debug, error, info, panic, trace, warn}; - use embassy_futures::join::join; use embassy_usb::class::hid::{HidReaderWriter, ReportId, RequestHandler}; use embassy_usb::control::OutResponse; diff --git a/embassy/demos/picow/src/main.rs b/embassy/demos/picow/src/main.rs index e6cd1b6..1e19b1a 100644 --- a/embassy/demos/picow/src/main.rs +++ b/embassy/demos/picow/src/main.rs @@ -2,16 +2,11 @@ #![no_main] #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] pub use log::{debug, error, info, log, trace, warn}; -#[allow(unused_imports)] -#[cfg(feature = "defmt")] -pub use defmt::{debug, error, info, panic, trace, warn}; - use core::ops::ControlFlow; -use {defmt_rtt as _, panic_probe as _}; +use {panic_probe as _}; use embassy_executor::Spawner; use embassy_futures::select::select; diff --git a/embassy/demos/picow/src/picowmenu.rs b/embassy/demos/picow/src/picowmenu.rs index 8c60616..29c36de 100644 --- a/embassy/demos/picow/src/picowmenu.rs +++ b/embassy/demos/picow/src/picowmenu.rs @@ -2,13 +2,8 @@ #![allow(unused)] #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] pub use log::{debug, error, info, log, trace, warn}; -#[allow(unused_imports)] -#[cfg(feature = "defmt")] -pub use defmt::{debug, error, info, panic, trace, warn}; - use core::fmt::{Write as _, Debug, Display}; use core::future::{poll_fn, Future}; use core::ops::{DerefMut, ControlFlow}; diff --git a/embassy/demos/picow/src/serial.rs b/embassy/demos/picow/src/serial.rs index 8dac629..46082d8 100644 --- a/embassy/demos/picow/src/serial.rs +++ b/embassy/demos/picow/src/serial.rs @@ -1,13 +1,8 @@ //! Serial on rp2040 pins with a `BufferedUart`. #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] pub use log::{debug, error, info, log, trace, warn}; -#[allow(unused_imports)] -#[cfg(feature = "defmt")] -pub use defmt::{debug, error, info, panic, trace, warn}; - use embassy_rp::peripherals::*; use embassy_rp::bind_interrupts; use embassy_rp::uart::{ diff --git a/embassy/demos/picow/src/usb.rs b/embassy/demos/picow/src/usb.rs index cc8c636..77ba4aa 100644 --- a/embassy/demos/picow/src/usb.rs +++ b/embassy/demos/picow/src/usb.rs @@ -1,11 +1,6 @@ #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] pub use log::{debug, error, info, log, trace, warn}; -#[allow(unused_imports)] -#[cfg(feature = "defmt")] -pub use defmt::{debug, error, info, panic, trace, warn}; - use embassy_futures::join::{join, join4}; use embassy_rp::bind_interrupts; use embassy_rp::peripherals::USB; diff --git a/embassy/demos/picow/src/w5500.rs b/embassy/demos/picow/src/w5500.rs index e045ab7..7665111 100644 --- a/embassy/demos/picow/src/w5500.rs +++ b/embassy/demos/picow/src/w5500.rs @@ -3,13 +3,8 @@ // MIT or Apache-2.0 license #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] pub use log::{debug, error, info, log, trace, warn}; -#[allow(unused_imports)] -#[cfg(feature = "defmt")] -pub use defmt::{debug, error, info, panic, trace, warn}; - use embassy_executor::Spawner; use embassy_net::{Stack, StackResources}; use embassy_rp::gpio::{Input, Level, Output, Pull}; diff --git a/embassy/demos/picow/src/wifi.rs b/embassy/demos/picow/src/wifi.rs index e044436..c91ab54 100644 --- a/embassy/demos/picow/src/wifi.rs +++ b/embassy/demos/picow/src/wifi.rs @@ -4,14 +4,7 @@ // MIT or Apache-2.0 license #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] -pub use { - log::{debug, error, info, log, trace, warn}, -}; - -#[allow(unused_imports)] -#[cfg(feature = "defmt")] -pub use defmt::{debug, info, warn, panic, error, trace}; +pub use log::{debug, error, info, log, trace, warn}; use embassy_rp::gpio::{Level, Output}; use embassy_rp::pio::Pio; diff --git a/embassy/demos/std/Cargo.toml b/embassy/demos/std/Cargo.toml index 6327bad..80e1436 100644 --- a/embassy/demos/std/Cargo.toml +++ b/embassy/demos/std/Cargo.toml @@ -30,7 +30,7 @@ async-io = "1.6.0" sunset-embassy = { path = "../../" } sunset = { path = "../../..", features = ["rsa", "std"] } -sunset-demo-embassy-common= { path = "../common", features = ["log"] } +sunset-demo-embassy-common= { path = "../common" } critical-section = "1.1" rand = { version = "0.8", default-features = false, features = ["getrandom"] } diff --git a/embassy/src/embassy_sunset.rs b/embassy/src/embassy_sunset.rs index dfd7b0b..2fdd0d6 100644 --- a/embassy/src/embassy_sunset.rs +++ b/embassy/src/embassy_sunset.rs @@ -1,11 +1,6 @@ #[allow(unused_imports)] -#[cfg(not(feature = "defmt"))] pub use log::{debug, error, info, log, trace, warn}; -#[allow(unused_imports)] -#[cfg(feature = "defmt")] -pub use defmt::{debug, error, info, panic, trace, warn}; - use core::future::{poll_fn, Future}; use core::task::{Poll, Context}; use core::sync::atomic::AtomicBool; diff --git a/src/prelude.rs b/src/prelude.rs deleted file mode 100644 index c0fba7a..0000000 --- a/src/prelude.rs +++ /dev/null @@ -1,11 +0,0 @@ -#![allow(unused_imports)] - -#[cfg(not(feature = "defmt"))] -pub use { - log::{debug, error, info, log, trace, warn}, -}; - -#[cfg(feature = "defmt")] -pub use defmt::{debug, info, warn, panic, error, trace}; - -pub use crate::error::{Error, Result, TrapBug};