Eliminate esp-hal's ufmt feature

esp-rs · Sep 3, 2024 · 1caa796 · 1caa796
1 parent 9c3b171
commit 1caa796
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/esp-hal/Cargo.toml b/esp-hal/Cargo.toml
@@ -48,7 +48,7 @@ strum                    = { version = "0.26.3", default-features = false, featu
 void                     = { version = "1.0.2", default-features = false }
 usb-device               = { version = "0.3.2", optional = true }
 rand_core                = "0.6.4"
-ufmt-write               = { version = "0.1.0", optional = true }
+ufmt-write               = "0.1.0"
 xtensa-lx                = { version = "0.9.0", optional = true }
 
 # IMPORTANT:
@@ -160,8 +160,6 @@ embedded-hal = ["dep:embedded-hal", "dep:embedded-hal-nb", "dep:embedded-can"]
 embedded-hal-02 = ["dep:embedded-hal-02"]
 ## Implement the traits defined in `embedded-io` for certain peripherals.
 embedded-io = ["dep:embedded-io"]
-## Implement the `ufmt_write::uWrite` trait for certain peripherals.
-ufmt = ["dep:ufmt-write"]
 
 #! ### PSRAM Feature Flags
 ## Use externally connected PSRAM (2MB).
@@ -184,7 +182,7 @@ opsram-8m = []
 opsram-16m = []
 
 # This feature is intended for testing; you probably don't want to enable it:
-ci = ["async", "embedded-hal-02", "embedded-io", "ufmt", "defmt", "bluetooth", "place-spi-driver-in-ram"]
+ci = ["async", "embedded-hal-02", "embedded-io", "defmt", "bluetooth", "place-spi-driver-in-ram"]
 
 [lints.clippy]
 mixed_attributes_style = "allow"

diff --git a/esp-hal/src/uart.rs b/esp-hal/src/uart.rs
@@ -1662,7 +1662,6 @@ impl_instance!(UART1, 1, U1TXD, U1RXD, U1CTS, U1RTS, Uart1);
 #[cfg(uart2)]
 impl_instance!(UART2, 2, U2TXD, U2RXD, U2CTS, U2RTS, Uart2);
 
-#[cfg(feature = "ufmt")]
 impl<T, M> ufmt_write::uWrite for Uart<'_, T, M>
 where
     T: Instance,
@@ -1681,7 +1680,6 @@ where
     }
 }
 
-#[cfg(feature = "ufmt")]
 impl<T, M> ufmt_write::uWrite for UartTx<'_, T, M>
 where
     T: Instance,

diff --git a/esp-hal/src/usb_serial_jtag.rs b/esp-hal/src/usb_serial_jtag.rs
@@ -425,7 +425,6 @@ where
     }
 }
 
-#[cfg(feature = "ufmt")]
 impl<M> ufmt_write::uWrite for UsbSerialJtag<'_, M>
 where
     M: Mode,
@@ -443,7 +442,6 @@ where
     }
 }
 
-#[cfg(feature = "ufmt")]
 impl<M> ufmt_write::uWrite for UsbSerialJtagTx<'_, M>
 where
     M: Mode,