diff options
| author | xoviat <[email protected]> | 2021-03-02 00:32:23 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2021-03-02 00:32:23 +0100 |
| commit | 9626aee7dbe5fe454a014beee82383bc3f102a91 (patch) | |
| tree | 6d155c12dd0563056874ecc97d57c6ac521bcf5c /embassy-nrf/src | |
| parent | 084b64053a562797fa3d88bb7dde9ddd8db792f1 (diff) | |
Move traits to separate crate.
Diffstat (limited to 'embassy-nrf/src')
| -rw-r--r-- | embassy-nrf/src/gpiote.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/qspi.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/uarte.rs | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/embassy-nrf/src/gpiote.rs b/embassy-nrf/src/gpiote.rs index 78bb2aeb6..7cc649107 100644 --- a/embassy-nrf/src/gpiote.rs +++ b/embassy-nrf/src/gpiote.rs | |||
| @@ -4,7 +4,7 @@ use core::ops::Deref; | |||
| 4 | use core::pin::Pin; | 4 | use core::pin::Pin; |
| 5 | use core::ptr; | 5 | use core::ptr; |
| 6 | use core::task::{Context, Poll}; | 6 | use core::task::{Context, Poll}; |
| 7 | use embassy::gpio::{WaitForHigh, WaitForLow}; | 7 | use embassy::traits::gpio::{WaitForHigh, WaitForLow}; |
| 8 | use embassy::interrupt::InterruptExt; | 8 | use embassy::interrupt::InterruptExt; |
| 9 | use embassy::util::Signal; | 9 | use embassy::util::Signal; |
| 10 | 10 | ||
diff --git a/embassy-nrf/src/qspi.rs b/embassy-nrf/src/qspi.rs index bee6abfa1..cb7f5a5be 100644 --- a/embassy-nrf/src/qspi.rs +++ b/embassy-nrf/src/qspi.rs | |||
| @@ -23,7 +23,7 @@ use crate::util::peripheral::{PeripheralMutex, PeripheralState}; | |||
| 23 | // - activate/deactivate | 23 | // - activate/deactivate |
| 24 | // - set gpio in high drive | 24 | // - set gpio in high drive |
| 25 | 25 | ||
| 26 | use embassy::flash::{Error, Flash}; | 26 | use embassy::traits::flash::{Error, Flash}; |
| 27 | use embassy::util::{DropBomb, WakerRegistration}; | 27 | use embassy::util::{DropBomb, WakerRegistration}; |
| 28 | use futures::future::poll_fn; | 28 | use futures::future::poll_fn; |
| 29 | 29 | ||
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs index 9d5ff81aa..0cc9790b2 100644 --- a/embassy-nrf/src/uarte.rs +++ b/embassy-nrf/src/uarte.rs | |||
| @@ -207,7 +207,7 @@ where | |||
| 207 | } | 207 | } |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | impl<T: Instance> embassy::uart::Uart for Uarte<T> { | 210 | impl<T: Instance> embassy::traits::uart::Uart for Uarte<T> { |
| 211 | type ReceiveFuture<'a> = ReceiveFuture<'a, T>; | 211 | type ReceiveFuture<'a> = ReceiveFuture<'a, T>; |
| 212 | type SendFuture<'a> = SendFuture<'a, T>; | 212 | type SendFuture<'a> = SendFuture<'a, T>; |
| 213 | 213 | ||
| @@ -287,7 +287,7 @@ impl<'a, T> Future for SendFuture<'a, T> | |||
| 287 | where | 287 | where |
| 288 | T: Instance, | 288 | T: Instance, |
| 289 | { | 289 | { |
| 290 | type Output = Result<(), embassy::uart::Error>; | 290 | type Output = Result<(), embassy::traits::uart::Error>; |
| 291 | 291 | ||
| 292 | fn poll(self: core::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> { | 292 | fn poll(self: core::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> { |
| 293 | let Self { uarte, buf } = unsafe { self.get_unchecked_mut() }; | 293 | let Self { uarte, buf } = unsafe { self.get_unchecked_mut() }; |
| @@ -355,7 +355,7 @@ impl<'a, T> Future for ReceiveFuture<'a, T> | |||
| 355 | where | 355 | where |
| 356 | T: Instance, | 356 | T: Instance, |
| 357 | { | 357 | { |
| 358 | type Output = Result<(), embassy::uart::Error>; | 358 | type Output = Result<(), embassy::traits::uart::Error>; |
| 359 | 359 | ||
| 360 | fn poll(self: core::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> { | 360 | fn poll(self: core::pin::Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> { |
| 361 | let Self { uarte, buf } = unsafe { self.get_unchecked_mut() }; | 361 | let Self { uarte, buf } = unsafe { self.get_unchecked_mut() }; |
