Remove UarteExt

Author: hannobraun

boards/adafruit-nrf52-bluefruit-le/src/lib.rs

@@ -241,7 +241,8 @@ impl Board {
     pub fn new(cp: CorePeripherals, p: Peripherals) -> Self {
         let pins = p.P0.split();
 
-        let cdc_uarte = p.UARTE0.constrain(
+        let cdc_uarte = Uarte::new(
+            p.UARTE0,
             uarte::Pins {
                 txd: pins.p0_06.into_push_pull_output(Level::High).degrade(),
                 rxd: pins.p0_08.into_floating_input().degrade(),

boards/nRF52-DK/src/lib.rs

@@ -300,7 +300,9 @@ impl Board {
         // The nRF52-DK features an USB CDC port.
         // It features HWFC but does not have to use it.
         // It can transmit a flexible baudrate of up to 1Mbps.
-        let cdc_uart = p.UARTE0.constrain(uarte::Pins {
+        let cdc_uart = Uarte::new(
+                p.UARTE0,
+                uarte::Pins {
                 txd: pins0.p0_06.into_push_pull_output(Level::High).degrade(),
                 rxd: pins0.p0_08.into_floating_input().degrade(),
                 cts: Some(pins0.p0_07.into_floating_input().degrade()),

boards/nRF52840-DK/src/lib.rs

@@ -329,7 +329,9 @@ impl Board {
         // The nRF52840-DK features an USB CDC port.
         // It features HWFC but does not have to use it.
         // It can transmit a flexible baudrate of up to 1Mbps.
-        let cdc_uart = p.UARTE0.constrain(uarte::Pins {
+        let cdc_uart = Uarte::new(
+            p.UARTE0,
+            uarte::Pins {
                 txd: pins0.p0_06.into_push_pull_output(Level::High).degrade(),
                 rxd: pins0.p0_08.into_floating_input().degrade(),
                 cts: Some(pins0.p0_07.into_floating_input().degrade()),

nrf52-hal-common/src/lib.rs

@@ -30,7 +30,6 @@ pub mod prelude {
     pub use crate::clocks::ClocksExt;
     pub use crate::gpio::GpioExt;
     pub use crate::time::U32Ext;
-    pub use crate::uarte::UarteExt;
 }
 
 /// Length of Nordic EasyDMA differs for MCUs

nrf52-hal-common/src/uarte.rs

@@ -30,15 +30,6 @@ pub use crate::target::uarte0::{
     config::PARITYW as Parity,
 };
 
-pub trait UarteExt: Deref<Target = uarte0::RegisterBlock> + Sized {
-    fn constrain(self, pins: Pins, parity: Parity, baudrate: Baudrate) -> Uarte<Self>;
-}
-
-impl UarteExt for UARTE0 {
-    fn constrain(self, pins: Pins, parity: Parity, baudrate: Baudrate) -> Uarte<Self> {
-        Uarte::new(self, pins, parity, baudrate)
-    }
-}
 
 /// Interface to a UARTE instance
 ///
@@ -50,7 +41,7 @@ impl UarteExt for UARTE0 {
 ///     - nrf52840: Section 6.1.2
 pub struct Uarte<T>(T);
 
-impl<T> Uarte<T> where T: UarteExt {
+impl<T> Uarte<T> where T: Instance {
     pub fn new(uarte: T, mut pins: Pins, parity: Parity, baudrate: Baudrate) -> Self {
         // Select pins
         uarte.psel.rxd.write(|w| {
@@ -337,7 +328,7 @@ impl<T> Uarte<T> where T: UarteExt {
     }
 }
 
-impl<T> fmt::Write for Uarte<T> where T: UarteExt {
+impl<T> fmt::Write for Uarte<T> where T: Instance {
     fn write_str(&mut self, s: &str) -> fmt::Result {
         // Copy all data into an on-stack buffer so we never try to EasyDMA from
         // flash
@@ -367,3 +358,8 @@ pub enum Error {
     Receive,
     Timeout(usize),
 }
+
+
+pub trait Instance: Deref<Target = uarte0::RegisterBlock> {}
+
+impl Instance for UARTE0 {}

nrf52810-hal/src/lib.rs

@@ -11,7 +11,6 @@ pub mod prelude {
     pub use crate::clocks::ClocksExt;
     pub use crate::gpio::GpioExt;
     pub use crate::time::U32Ext;
-    pub use crate::uarte::UarteExt;
 }
 
 pub use crate::clocks::Clocks;

nrf52840-hal/src/lib.rs

@@ -11,7 +11,6 @@ pub mod prelude {
     pub use crate::clocks::ClocksExt;
     pub use crate::gpio::GpioExt;
     pub use crate::time::U32Ext;
-    pub use crate::uarte::UarteExt;
 }
 
 pub use crate::clocks::Clocks;