aboutsummaryrefslogtreecommitdiff
path: root/embassy-sync/src
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-09-03 00:35:21 +0200
committerGitHub <[email protected]>2023-09-03 00:35:21 +0200
commit9baa3bafb0330d58bd98c0a974968c97c54c53a5 (patch)
treec3b455ae417c41a1f2a57a5d7cf56d8bc3fb6606 /embassy-sync/src
parent9d8c527308522698bfb6596bdb67bec826e0fb5a (diff)
parent360286e67c355d23a355f83bbb6586b3fa3b3a7e (diff)
Merge pull request #1854 from bugadani/str
embassy-{net, sync, time}: Use fmt::unwrap
Diffstat (limited to 'embassy-sync/src')
-rw-r--r--embassy-sync/src/channel.rs2
-rw-r--r--embassy-sync/src/mutex.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/embassy-sync/src/channel.rs b/embassy-sync/src/channel.rs
index 62ea1307d..a512e0c41 100644
--- a/embassy-sync/src/channel.rs
+++ b/embassy-sync/src/channel.rs
@@ -471,7 +471,7 @@ where
471 } 471 }
472 472
473 fn lock<R>(&self, f: impl FnOnce(&mut ChannelState<T, N>) -> R) -> R { 473 fn lock<R>(&self, f: impl FnOnce(&mut ChannelState<T, N>) -> R) -> R {
474 self.inner.lock(|rc| f(&mut *rc.borrow_mut())) 474 self.inner.lock(|rc| f(&mut *unwrap!(rc.try_borrow_mut())))
475 } 475 }
476 476
477 fn try_receive_with_context(&self, cx: Option<&mut Context<'_>>) -> Result<T, TryReceiveError> { 477 fn try_receive_with_context(&self, cx: Option<&mut Context<'_>>) -> Result<T, TryReceiveError> {
diff --git a/embassy-sync/src/mutex.rs b/embassy-sync/src/mutex.rs
index fcf056d36..72459d660 100644
--- a/embassy-sync/src/mutex.rs
+++ b/embassy-sync/src/mutex.rs
@@ -149,7 +149,7 @@ where
149{ 149{
150 fn drop(&mut self) { 150 fn drop(&mut self) {
151 self.mutex.state.lock(|s| { 151 self.mutex.state.lock(|s| {
152 let mut s = s.borrow_mut(); 152 let mut s = unwrap!(s.try_borrow_mut());
153 s.locked = false; 153 s.locked = false;
154 s.waker.wake(); 154 s.waker.wake();
155 }) 155 })