Shared fmt crate

cyw43/Cargo.toml

@@ -10,8 +10,8 @@ repository = "https://github.com/embassy-rs/embassy"
 documentation = "https://docs.embassy.dev/cyw43"
 
 [features]
-defmt = ["dep:defmt", "heapless/defmt-03", "embassy-time/defmt"]
-log = ["dep:log"]
+defmt = ["dep:defmt", "heapless/defmt-03", "embassy-time/defmt", "embassy-fmt/defmt", "embassy-futures/defmt", "embassy-sync/defmt", "embassy-net-driver-channel/defmt"]
+log = ["dep:log", "embassy-fmt/log"]
 
 # Fetch console logs from the WiFi firmware and forward them to `log` or `defmt`.
 firmware-logs = []
@@ -33,6 +33,7 @@ embedded-hal-1 = { package = "embedded-hal", version = "1.0" }
 num_enum = { version = "0.5.7", default-features = false }
 
 heapless = "0.8.0"
+embassy-fmt = { version = "0.1.0", path = "../embassy-fmt" }
 
 [package.metadata.embassy_docs]
 src_base = "https://github.com/embassy-rs/embassy/blob/cyw43-v$VERSION/cyw43/src/"

cyw43/src/control.rs

@@ -1,13 +1,13 @@
 use core::cmp::{max, min};
 use core::iter::zip;
 
+use embassy_fmt::Bytes;
 use embassy_net_driver_channel as ch;
 use embassy_net_driver_channel::driver::{HardwareAddress, LinkState};
 use embassy_time::{Duration, Timer};
 
 use crate::consts::*;
 use crate::events::{Event, EventSubscriber, Events};
-use crate::fmt::Bytes;
 use crate::ioctl::{IoctlState, IoctlType};
 use crate::structs::*;
 use crate::{countries, events, PowerManagementMode};

cyw43/src/ioctl.rs

@@ -2,10 +2,9 @@ use core::cell::{Cell, RefCell};
 use core::future::poll_fn;
 use core::task::{Poll, Waker};
 
+use embassy_fmt::Bytes;
 use embassy_sync::waitqueue::WakerRegistration;
 
-use crate::fmt::Bytes;
-
 #[derive(Clone, Copy)]
 pub enum IoctlType {
     Get = 0,

cyw43/src/lib.rs

@@ -5,8 +5,10 @@
 #![doc = include_str!("../README.md")]
 #![warn(missing_docs)]
 
-// This mod MUST go first, so that the others see its macros.
-pub(crate) mod fmt;
+// This crate MUST go first, and use the old `extern crate` syntax, so that textual scope is used
+// and these macros become globally available here.
+#[macro_use]
+extern crate embassy_fmt;
 
 mod bus;
 mod consts;

cyw43/src/runner.rs

@@ -1,3 +1,4 @@
+use embassy_fmt::Bytes;
 use embassy_futures::select::{select3, Either3};
 use embassy_net_driver_channel as ch;
 use embassy_time::{block_for, Duration, Timer};
@@ -7,7 +8,6 @@ use crate::bus::Bus;
 pub use crate::bus::SpiBusCyw43;
 use crate::consts::*;
 use crate::events::{Event, Events, Status};
-use crate::fmt::Bytes;
 use crate::ioctl::{IoctlState, IoctlType, PendingIoctl};
 use crate::nvram::NVRAM;
 use crate::structs::*;

cyw43/src/structs.rs

@@ -1,5 +1,6 @@
+use embassy_fmt::Bytes;
+
 use crate::events::Event;
-use crate::fmt::Bytes;
 
 macro_rules! impl_bytes {
     ($t:ident) => {

embassy-boot-nrf/Cargo.toml

@@ -34,12 +34,14 @@ embedded-storage-async = { version = "0.4.1" }
 cfg-if = "1.0.0"
 
 nrf-softdevice-mbr = { version = "0.2.0", optional = true }
+embassy-fmt = { version = "0.1.0", path = "../embassy-fmt" }
 
 [features]
 defmt = [
     "dep:defmt",
     "embassy-boot/defmt",
     "embassy-nrf/defmt",
+    "embassy-fmt/defmt",
 ]
 softdevice = [
     "nrf-softdevice-mbr",

embassy-boot-nrf/src/lib.rs

@@ -1,7 +1,6 @@
 #![no_std]
 #![warn(missing_docs)]
 #![doc = include_str!("../README.md")]
-mod fmt;
 
 pub use embassy_boot::{
     AlignedBuffer, BlockingFirmwareState, BlockingFirmwareUpdater, BootError, BootLoaderConfig, FirmwareState,
@@ -12,6 +11,11 @@ use embassy_nrf::peripherals::WDT;
 use embassy_nrf::wdt;
 use embedded_storage::nor_flash::{ErrorType, NorFlash, ReadNorFlash};
 
+// This crate MUST go first, and use the old `extern crate` syntax, so that textual scope is used
+// and these macros become globally available here.
+#[macro_use]
+extern crate embassy_fmt;
+
 /// A bootloader for nRF devices.
 pub struct BootLoader<const BUFFER_SIZE: usize = PAGE_SIZE>;