m: Don't re-implement ready! and pin!

Bumps MSRV to 1.65

Signed-off-by: John Nunley <dev@notgull.net>

Author: notgull

.github/workflows/ci.yml

@@ -72,7 +72,7 @@ jobs:
       matrix:
         # When updating this, the reminder to update the minimum supported
         # Rust version in Cargo.toml.
-        rust: ['1.61']
+        rust: ['1.65']
     steps:
       - uses: actions/checkout@v4
       - name: Install cargo-hack

Cargo.toml

@@ -6,7 +6,7 @@ name = "async-lock"
 version = "3.4.1"
 authors = ["Stjepan Glavina <stjepang@gmail.com>"]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.65"
 description = "Async synchronization primitives"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/smol-rs/async-lock"

src/barrier.rs

@@ -3,7 +3,7 @@ use event_listener_strategy::{easy_wrapper, EventListenerFuture, Strategy};
 
 use core::fmt;
 use core::pin::Pin;
-use core::task::Poll;
+use core::task::{ready, Poll};
 
 use crate::futures::Lock;
 use crate::Mutex;

src/lib.rs

@@ -41,36 +41,6 @@
 
 extern crate alloc;
 
-/// Simple macro to extract the value of `Poll` or return `Pending`.
-///
-/// TODO: Drop in favor of `core::task::ready`, once MSRV is bumped to 1.64.
-macro_rules! ready {
-    ($e:expr) => {{
-        use ::core::task::Poll;
-
-        match $e {
-            Poll::Ready(v) => v,
-            Poll::Pending => return Poll::Pending,
-        }
-    }};
-}
-
-/// Pins a variable on the stack.
-///
-/// TODO: Drop in favor of `core::pin::pin`, once MSRV is bumped to 1.68.
-#[cfg(all(feature = "std", not(target_family = "wasm")))]
-macro_rules! pin {
-    ($($x:ident),* $(,)?) => {
-        $(
-            let mut $x = $x;
-            #[allow(unused_mut)]
-            let mut $x = unsafe {
-                core::pin::Pin::new_unchecked(&mut $x)
-            };
-        )*
-    }
-}
-
 /// Make the given function const if the given condition is true.
 macro_rules! const_fn {
     (

src/mutex.rs

@@ -4,7 +4,7 @@ use core::fmt;
 use core::marker::{PhantomData, PhantomPinned};
 use core::ops::{Deref, DerefMut};
 use core::pin::Pin;
-use core::task::Poll;
+use core::task::{ready, Poll};
 
 use alloc::sync::Arc;
 

src/once_cell.rs

@@ -3,6 +3,7 @@ use core::convert::Infallible;
 use core::fmt;
 use core::future::Future;
 use core::mem::{forget, MaybeUninit};
+use core::pin::pin;
 use core::ptr;
 
 use crate::sync::atomic::{AtomicUsize, Ordering};
@@ -800,7 +801,7 @@ fn now_or_never<T>(f: impl Future<Output = T>) -> T {
     }
     unsafe fn drop(_: *const ()) {}
 
-    pin!(f);
+    let f = pin!(f);
 
     let waker = unsafe { Waker::from_raw(RawWaker::new(ptr::null(), &NOOP_WAKER)) };
 

src/rwlock/futures.rs

@@ -1,7 +1,7 @@
 use core::fmt;
 use core::mem::ManuallyDrop;
 use core::pin::Pin;
-use core::task::Poll;
+use core::task::{ready, Poll};
 
 use alloc::sync::Arc;
 

src/rwlock/raw.rs

@@ -9,7 +9,7 @@
 use core::marker::PhantomPinned;
 use core::mem::forget;
 use core::pin::Pin;
-use core::task::Poll;
+use core::task::{ready, Poll};
 
 use crate::sync::atomic::{AtomicUsize, Ordering};
 

src/semaphore.rs

@@ -2,7 +2,7 @@ use core::fmt;
 use core::marker::PhantomPinned;
 use core::mem;
 use core::pin::Pin;
-use core::task::Poll;
+use core::task::{ready, Poll};
 
 use crate::sync::atomic::{AtomicUsize, Ordering};