From 5732ee7ca975c0dd1afa83ade1667a2599d20985 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Fri, 26 Apr 2024 23:18:28 +0200
Subject: Reduce use of the full `futures` crate.

---
 embassy-time/src/timer.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'embassy-time/src')

diff --git a/embassy-time/src/timer.rs b/embassy-time/src/timer.rs
index 757c3ff00..bc39d8bc7 100644
--- a/embassy-time/src/timer.rs
+++ b/embassy-time/src/timer.rs
@@ -1,10 +1,10 @@
 use core::future::{poll_fn, Future};
-use core::pin::Pin;
+use core::pin::{pin, Pin};
 use core::task::{Context, Poll};
 
 use futures_util::future::{select, Either};
 use futures_util::stream::FusedStream;
-use futures_util::{pin_mut, Stream};
+use futures_util::Stream;
 
 use crate::{Duration, Instant};
 
@@ -19,8 +19,7 @@ pub struct TimeoutError;
 /// work on the future is stopped (`poll` is no longer called), the future is dropped and `Err(TimeoutError)` is returned.
 pub async fn with_timeout<F: Future>(timeout: Duration, fut: F) -> Result<F::Output, TimeoutError> {
     let timeout_fut = Timer::after(timeout);
-    pin_mut!(fut);
-    match select(fut, timeout_fut).await {
+    match select(pin!(fut), timeout_fut).await {
         Either::Left((r, _)) => Ok(r),
         Either::Right(_) => Err(TimeoutError),
     }
@@ -32,8 +31,7 @@ pub async fn with_timeout<F: Future>(timeout: Duration, fut: F) -> Result<F::Out
 /// work on the future is stopped (`poll` is no longer called), the future is dropped and `Err(TimeoutError)` is returned.
 pub async fn with_deadline<F: Future>(at: Instant, fut: F) -> Result<F::Output, TimeoutError> {
     let timeout_fut = Timer::at(at);
-    pin_mut!(fut);
-    match select(fut, timeout_fut).await {
+    match select(pin!(fut), timeout_fut).await {
         Either::Left((r, _)) => Ok(r),
         Either::Right(_) => Err(TimeoutError),
     }
-- 
cgit