Skip to content

Commit 5ea9f23

Browse files
committed
Remove pin-utils
Can use core::pin::pin macro instead
1 parent 6574fa7 commit 5ea9f23

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

async/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ embassy-sync = { version = "0.7" }
1212
embassy-futures = { version = "0.1" }
1313
embedded-io-async = "0.6"
1414
portable-atomic.workspace = true
15-
pin-utils = { version = "0.1" }
1615

1716
sunset = { workspace = true, features = ["embedded-io"] }
1817

async/src/async_sunset.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use core::future::{poll_fn, Future};
55
use core::sync::atomic::AtomicBool;
66
use core::sync::atomic::Ordering::{Relaxed, SeqCst};
77
use core::task::{Context, Poll, Poll::Pending, Poll::Ready};
8+
use core::pin::pin;
89

910
use embassy_futures::join;
1011
use embassy_futures::select::select;
@@ -15,8 +16,6 @@ use embassy_sync::signal::Signal;
1516
use embassy_sync::waitqueue::WakerRegistration;
1617
use embedded_io_async::{BufRead, Read, Write};
1718

18-
use pin_utils::pin_mut;
19-
2019
use sunset::config::MAX_CHANNELS;
2120
use sunset::event::Event;
2221
use sunset::{error, ChanData, ChanHandle, ChanNum, CliServ, Error, Result, Runner};
@@ -375,7 +374,7 @@ impl<'a, CS: CliServ> AsyncSunset<'a, CS> {
375374
poll_fn(|cx| {
376375
// Attempt to lock .inner
377376
let i = self.inner.lock();
378-
pin_mut!(i);
377+
let i = pin!(i);
379378
match i.poll(cx) {
380379
Poll::Ready(mut inner) => f(&mut inner, cx),
381380
Poll::Pending => {
@@ -391,7 +390,7 @@ impl<'a, CS: CliServ> AsyncSunset<'a, CS> {
391390
poll_fn(|cx| {
392391
// Attempt to lock .inner
393392
let i = self.inner.lock();
394-
pin_mut!(i);
393+
let i = pin!(i);
395394
let Ready(mut inner) = i.poll(cx) else {
396395
return Pending;
397396
};
@@ -406,7 +405,7 @@ impl<'a, CS: CliServ> AsyncSunset<'a, CS> {
406405

407406
let res = {
408407
let w = wsock.write(buf);
409-
pin_mut!(w);
408+
let w = pin!(w);
410409
w.poll(cx)
411410
};
412411

@@ -557,7 +556,7 @@ impl<'a, CS: CliServ> ChanCore for AsyncSunset<'a, CS> {
557556
) -> Poll<Result<()>> {
558557
// Attempt to lock .inner
559558
let i = self.inner.lock();
560-
pin_mut!(i);
559+
let i = pin!(i);
561560
let Ready(mut inner) = i.poll(cx) else {
562561
return Pending;
563562
};
@@ -581,7 +580,7 @@ impl<'a, CS: CliServ> ChanCore for AsyncSunset<'a, CS> {
581580
) -> Poll<Result<usize>> {
582581
// Attempt to lock .inner
583582
let i = self.inner.lock();
584-
pin_mut!(i);
583+
let i = pin!(i);
585584
let Ready(mut inner) = i.poll(cx) else {
586585
return Pending;
587586
};
@@ -618,7 +617,7 @@ impl<'a, CS: CliServ> ChanCore for AsyncSunset<'a, CS> {
618617
) -> Poll<Result<usize>> {
619618
// Attempt to lock .inner
620619
let i = self.inner.lock();
621-
pin_mut!(i);
620+
let i = pin!(i);
622621
let Ready(mut inner) = i.poll(cx) else {
623622
return Pending;
624623
};
@@ -650,7 +649,7 @@ impl<'a, CS: CliServ> ChanCore for AsyncSunset<'a, CS> {
650649
) -> Poll<Result<()>> {
651650
// Attempt to lock .inner
652651
let i = self.inner.lock();
653-
pin_mut!(i);
652+
let i = pin!(i);
654653
let Ready(mut inner) = i.poll(cx) else {
655654
return Pending;
656655
};

0 commit comments

Comments
 (0)