max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid double-borrow

Browse Source
This commit is contained in:
Zoey Riordan 2022-08-30 15:57:38 +02:00
parent b2720117c4
commit 171077bacf
No known key found for this signature in database
GPG Key ID: BA53B4B2F0C3B584
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
embassy-nrf/src/buffered_uarte.rs
View File

@ -207,7 +207,8 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
async fn inner_read<'a>(&'a self, buf: &'a mut [u8]) -> Result<usize, core::convert::Infallible> { async fn inner_read<'a>(&'a self, buf: &'a mut [u8]) -> Result<usize, core::convert::Infallible> {
poll_fn(move |cx| { poll_fn(move |cx| {
let mut do_pend = false; let mut do_pend = false;
let res = self.inner.borrow_mut().with(|state| { let mut inner = self.inner.borrow_mut();
let res = inner.with(|state| {
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
trace!("poll_read"); trace!("poll_read");
@ -227,7 +228,7 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
Poll::Pending Poll::Pending
}); });
if do_pend { if do_pend {
self.inner.borrow().pend(); inner.pend();
} }
res res
@ -237,7 +238,8 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
async fn inner_write<'a>(&'a self, buf: &'a [u8]) -> Result<usize, core::convert::Infallible> { async fn inner_write<'a>(&'a self, buf: &'a [u8]) -> Result<usize, core::convert::Infallible> {
poll_fn(move |cx| { poll_fn(move |cx| {
let res = self.inner.borrow_mut().with(|state| { let mut inner = self.inner.borrow_mut();
let res = inner.with(|state| {
trace!("poll_write: {:?}", buf.len()); trace!("poll_write: {:?}", buf.len());
let tx_buf = state.tx.push_buf(); let tx_buf = state.tx.push_buf();
@ -258,7 +260,7 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
Poll::Ready(Ok(n)) Poll::Ready(Ok(n))
}); });
self.inner.borrow_mut().pend(); inner.pend();
res res
}) })
@ -307,13 +309,14 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
} }
fn inner_consume(&self, amt: usize) { fn inner_consume(&self, amt: usize) {
let signal = self.inner.borrow_mut().with(|state| { let mut inner = self.inner.borrow_mut();
let signal = inner.with(|state| {
let full = state.rx.is_full(); let full = state.rx.is_full();
state.rx.pop(amt); state.rx.pop(amt);
full full
}); });
if signal { if signal {
self.inner.borrow().pend(); inner.pend();
} }
} }
} }