@@ -5,6 +5,7 @@ use core::future::{poll_fn, Future};
55use core:: sync:: atomic:: AtomicBool ;
66use core:: sync:: atomic:: Ordering :: { Relaxed , SeqCst } ;
77use core:: task:: { Context , Poll , Poll :: Pending , Poll :: Ready } ;
8+ use core:: pin:: pin;
89
910use embassy_futures:: join;
1011use embassy_futures:: select:: select;
@@ -15,8 +16,6 @@ use embassy_sync::signal::Signal;
1516use embassy_sync:: waitqueue:: WakerRegistration ;
1617use embedded_io_async:: { BufRead , Read , Write } ;
1718
18- use pin_utils:: pin_mut;
19-
2019use sunset:: config:: MAX_CHANNELS ;
2120use sunset:: event:: Event ;
2221use 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