11 files changed, 15 insertions, 28 deletions

diff --git a/examples/nrf/src/bin/gpiote_port.rs b/examples/nrf/src/bin/gpiote_port.rs
index 76c861d95..3ea9a6e67 100644
--- a/examples/nrf/src/bin/gpiote_port.rs
+++ b/examples/nrf/src/bin/gpiote_port.rs
@@ -6,7 +6,6 @@
 mod example_common;
 
 use embassy::executor::Spawner;
-use embassy::traits::gpio::{WaitForHigh, WaitForLow};
 use embassy_nrf::gpio::{AnyPin, Input, Pin as _, Pull};
 use embassy_nrf::Peripherals;
 use example_common::*;
diff --git a/examples/nrf/src/bin/qspi.rs b/examples/nrf/src/bin/qspi.rs
index c7f9503bb..b2e6bfc15 100644
--- a/examples/nrf/src/bin/qspi.rs
+++ b/examples/nrf/src/bin/qspi.rs
@@ -7,7 +7,6 @@ mod example_common;
 
 use defmt::assert_eq;
 use embassy::executor::Spawner;
-use embassy::traits::flash::Flash;
 use embassy_nrf::Peripherals;
 use embassy_nrf::{interrupt, qspi};
 use example_common::*;
diff --git a/examples/nrf/src/bin/qspi_lowpower.rs b/examples/nrf/src/bin/qspi_lowpower.rs
index e9e1bac42..4e264ef2f 100644
--- a/examples/nrf/src/bin/qspi_lowpower.rs
+++ b/examples/nrf/src/bin/qspi_lowpower.rs
@@ -8,7 +8,6 @@ mod example_common;
 use core::mem;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
-use embassy::traits::flash::Flash;
 use embassy_nrf::Peripherals;
 use embassy_nrf::{interrupt, qspi};
 use example_common::*;
diff --git a/examples/nrf/src/bin/rng.rs b/examples/nrf/src/bin/rng.rs
index 2f1a26993..a35a9fa85 100644
--- a/examples/nrf/src/bin/rng.rs
+++ b/examples/nrf/src/bin/rng.rs
@@ -5,9 +5,7 @@
 #[path = "../example_common.rs"]
 mod example_common;
 
-use defmt::unwrap;
 use embassy::executor::Spawner;
-use embassy::traits::rng::Rng as _;
 use embassy_nrf::interrupt;
 use embassy_nrf::rng::Rng;
 use embassy_nrf::Peripherals;
@@ -19,14 +17,14 @@ async fn main(_spawner: Spawner, p: Peripherals) {
 
     // Async API
     let mut bytes = [0; 4];
-    unwrap!(rng.fill_bytes(&mut bytes).await); // nRF RNG is infallible
+    rng.fill_bytes(&mut bytes).await;
     defmt::info!("Some random bytes: {:?}", bytes);
 
     // Sync API with `rand`
     defmt::info!("A random number from 1 to 10: {:?}", rng.gen_range(1..=10));
 
     let mut bytes = [0; 1024];
-    unwrap!(rng.fill_bytes(&mut bytes).await);
+    rng.fill_bytes(&mut bytes).await;
     let zero_count: u32 = bytes.iter().fold(0, |acc, val| acc + val.count_zeros());
     let one_count: u32 = bytes.iter().fold(0, |acc, val| acc + val.count_ones());
     defmt::info!(
diff --git a/examples/nrf/src/bin/spim.rs b/examples/nrf/src/bin/spim.rs
index fc31d140a..cda3baa26 100644
--- a/examples/nrf/src/bin/spim.rs
+++ b/examples/nrf/src/bin/spim.rs
@@ -9,7 +9,6 @@ use embassy::executor::Spawner;
 use embassy_nrf::gpio::{Level, Output, OutputDrive};
 use embassy_nrf::Peripherals;
 use embassy_nrf::{interrupt, spim};
-use embassy_traits::spi::FullDuplex;
 use example_common::*;
 
 #[embassy::main]
@@ -31,7 +30,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     ncs.set_low();
     cortex_m::asm::delay(5);
     let tx = [0xFF];
-    unwrap!(spim.read_write(&mut [], &tx).await);
+    unwrap!(spim.transfer(&mut [], &tx).await);
     cortex_m::asm::delay(10);
     ncs.set_high();
 
@@ -44,7 +43,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     ncs.set_low();
     cortex_m::asm::delay(5000);
     let tx = [0b000_11101, 0];
-    unwrap!(spim.read_write(&mut rx, &tx).await);
+    unwrap!(spim.transfer(&mut rx, &tx).await);
     cortex_m::asm::delay(5000);
     ncs.set_high();
     info!("estat: {=[?]}", rx);
@@ -54,7 +53,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     ncs.set_low();
     cortex_m::asm::delay(5);
     let tx = [0b100_11111, 0b11];
-    unwrap!(spim.read_write(&mut rx, &tx).await);
+    unwrap!(spim.transfer(&mut rx, &tx).await);
     cortex_m::asm::delay(10);
     ncs.set_high();
 
@@ -63,7 +62,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     ncs.set_low();
     cortex_m::asm::delay(5);
     let tx = [0b000_10010, 0];
-    unwrap!(spim.read_write(&mut rx, &tx).await);
+    unwrap!(spim.transfer(&mut rx, &tx).await);
     cortex_m::asm::delay(10);
     ncs.set_high();
 
diff --git a/examples/nrf/src/bin/twim.rs b/examples/nrf/src/bin/twim.rs
index 4c2f2bf2e..1ac3a3945 100644
--- a/examples/nrf/src/bin/twim.rs
+++ b/examples/nrf/src/bin/twim.rs
@@ -26,7 +26,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     info!("Reading...");
 
     let mut buf = [0u8; 16];
-    unwrap!(twi.write_then_read(ADDRESS, &mut [0x00], &mut buf));
+    unwrap!(twi.blocking_write_read(ADDRESS, &mut [0x00], &mut buf));
 
     info!("Read: {=[u8]:x}", buf);
 }
diff --git a/examples/nrf/src/bin/twim_lowpower.rs b/examples/nrf/src/bin/twim_lowpower.rs
index 62a5f0c94..4a0596437 100644
--- a/examples/nrf/src/bin/twim_lowpower.rs
+++ b/examples/nrf/src/bin/twim_lowpower.rs
@@ -36,7 +36,7 @@ async fn main(_spawner: Spawner, mut p: Peripherals) {
         info!("Reading...");
 
         let mut buf = [0u8; 16];
-        unwrap!(twi.write_then_read(ADDRESS, &mut [0x00], &mut buf));
+        unwrap!(twi.blocking_write_read(ADDRESS, &mut [0x00], &mut buf));
 
         info!("Read: {=[u8]:x}", buf);
 
diff --git a/examples/nrf/src/bin/uart.rs b/examples/nrf/src/bin/uart.rs
index 208961c8b..68ee3978a 100644
--- a/examples/nrf/src/bin/uart.rs
+++ b/examples/nrf/src/bin/uart.rs
@@ -7,7 +7,6 @@ mod example_common;
 use example_common::*;
 
 use embassy::executor::Spawner;
-use embassy::traits::uart::{Read, Write};
 use embassy_nrf::gpio::NoPin;
 use embassy_nrf::{interrupt, uarte, Peripherals};
 
diff --git a/examples/nrf/src/bin/uart_idle.rs b/examples/nrf/src/bin/uart_idle.rs
index ec9a36026..76449c0e3 100644
--- a/examples/nrf/src/bin/uart_idle.rs
+++ b/examples/nrf/src/bin/uart_idle.rs
@@ -4,11 +4,9 @@
 
 #[path = "../example_common.rs"]
 mod example_common;
-use embassy_traits::uart::ReadUntilIdle;
 use example_common::*;
 
 use embassy::executor::Spawner;
-use embassy::traits::uart::Write;
 use embassy_nrf::gpio::NoPin;
 use embassy_nrf::{interrupt, uarte, Peripherals};
 
@@ -19,11 +17,9 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     config.baudrate = uarte::Baudrate::BAUD115200;
 
     let irq = interrupt::take!(UARTE0_UART0);
-    let mut uart = unsafe {
-        uarte::UarteWithIdle::new(
-            p.UARTE0, p.TIMER0, p.PPI_CH0, p.PPI_CH1, irq, p.P0_08, p.P0_06, NoPin, NoPin, config,
-        )
-    };
+    let mut uart = uarte::UarteWithIdle::new(
+        p.UARTE0, p.TIMER0, p.PPI_CH0, p.PPI_CH1, irq, p.P0_08, p.P0_06, NoPin, NoPin, config,
+    );
 
     info!("uarte initialized!");
 
diff --git a/examples/nrf/src/bin/uart_split.rs b/examples/nrf/src/bin/uart_split.rs
index 4b5dbb21f..a9c02e796 100644
--- a/examples/nrf/src/bin/uart_split.rs
+++ b/examples/nrf/src/bin/uart_split.rs
@@ -4,16 +4,15 @@
 
 #[path = "../example_common.rs"]
 mod example_common;
+use example_common::*;
+
 use embassy::blocking_mutex::kind::Noop;
 use embassy::channel::mpsc::{self, Channel, Sender};
+use embassy::executor::Spawner;
 use embassy::util::Forever;
+use embassy_nrf::gpio::NoPin;
 use embassy_nrf::peripherals::UARTE0;
 use embassy_nrf::uarte::UarteRx;
-use example_common::*;
-
-use embassy::executor::Spawner;
-use embassy::traits::uart::{Read, Write};
-use embassy_nrf::gpio::NoPin;
 use embassy_nrf::{interrupt, uarte, Peripherals};
 
 static CHANNEL: Forever<Channel<Noop, [u8; 8], 1>> = Forever::new();
diff --git a/examples/nrf/src/bin/wdt.rs b/examples/nrf/src/bin/wdt.rs
index 78c2205d9..cc199be9d 100644
--- a/examples/nrf/src/bin/wdt.rs
+++ b/examples/nrf/src/bin/wdt.rs
@@ -10,7 +10,6 @@ use embassy::executor::Spawner;
 use embassy_nrf::gpio::{Input, Pull};
 use embassy_nrf::wdt::{Config, Watchdog};
 use embassy_nrf::Peripherals;
-use embassy_traits::gpio::{WaitForHigh, WaitForLow};
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {