aboutsummaryrefslogtreecommitdiff
path: root/embassy-nrf/src/buffered_uarte.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-09-22 15:46:07 +0000
committerGitHub <[email protected]>2022-09-22 15:46:07 +0000
commitdacbc9acd5969d3ef0dda8825c960e909008ce83 (patch)
tree87d150bf3398969d4e8cec4f014e8d5ea043ec3a /embassy-nrf/src/buffered_uarte.rs
parentc1e25067daa53983777807f6d173f1318767b88a (diff)
parent10d1ad2343825388277dc54db649c9349a0b6de8 (diff)
Merge #963
963: Remove some uses of the `futures` crate r=Dirbaio a=Dirbaio - use `Future` from `core` - `poll_fn` is now stable in `core` since Rust 1.64 (out today) - Use `join` from `embassy-futures`. Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'embassy-nrf/src/buffered_uarte.rs')
-rw-r--r--embassy-nrf/src/buffered_uarte.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs
index c3cba2470..fec875cb8 100644
--- a/embassy-nrf/src/buffered_uarte.rs
+++ b/embassy-nrf/src/buffered_uarte.rs
@@ -15,7 +15,7 @@
15 15
16use core::cell::RefCell; 16use core::cell::RefCell;
17use core::cmp::min; 17use core::cmp::min;
18use core::future::Future; 18use core::future::{poll_fn, Future};
19use core::sync::atomic::{compiler_fence, Ordering}; 19use core::sync::atomic::{compiler_fence, Ordering};
20use core::task::Poll; 20use core::task::Poll;
21 21
@@ -23,7 +23,6 @@ use embassy_cortex_m::peripheral::{PeripheralMutex, PeripheralState, StateStorag
23use embassy_hal_common::ring_buffer::RingBuffer; 23use embassy_hal_common::ring_buffer::RingBuffer;
24use embassy_hal_common::{into_ref, PeripheralRef}; 24use embassy_hal_common::{into_ref, PeripheralRef};
25use embassy_sync::waitqueue::WakerRegistration; 25use embassy_sync::waitqueue::WakerRegistration;
26use futures::future::poll_fn;
27// Re-export SVD variants to allow user to directly set values 26// Re-export SVD variants to allow user to directly set values
28pub use pac::uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Parity}; 27pub use pac::uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Parity};
29 28