From 04d878196495d70c9265973efca080ff4ac30d8a Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Fri, 21 Feb 2025 10:16:18 +0100
Subject: [PATCH] Use ready!() from std

---
 quinn/src/connection.rs       | 2 +-
 quinn/src/lib.rs              | 9 ---------
 quinn/src/recv_stream.rs      | 2 +-
 quinn/src/runtime/async_io.rs | 2 +-
 quinn/src/runtime/tokio.rs    | 2 +-
 quinn/src/send_stream.rs      | 2 +-
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/quinn/src/connection.rs b/quinn/src/connection.rs
index 3d59b220a..983b695eb 100644
--- a/quinn/src/connection.rs
+++ b/quinn/src/connection.rs
@@ -6,7 +6,7 @@ use std::{
     net::{IpAddr, SocketAddr},
     pin::Pin,
     sync::Arc,
-    task::{Context, Poll, Waker},
+    task::{Context, Poll, Waker, ready},
 };
 
 use bytes::Bytes;
diff --git a/quinn/src/lib.rs b/quinn/src/lib.rs
index 81ffc5bfd..a3c6f5756 100644
--- a/quinn/src/lib.rs
+++ b/quinn/src/lib.rs
@@ -43,15 +43,6 @@
 
 use std::sync::Arc;
 
-macro_rules! ready {
-    ($e:expr $(,)?) => {
-        match $e {
-            std::task::Poll::Ready(t) => t,
-            std::task::Poll::Pending => return std::task::Poll::Pending,
-        }
-    };
-}
-
 mod connection;
 mod endpoint;
 mod incoming;
diff --git a/quinn/src/recv_stream.rs b/quinn/src/recv_stream.rs
index 3538bc1c4..b2df36766 100644
--- a/quinn/src/recv_stream.rs
+++ b/quinn/src/recv_stream.rs
@@ -2,7 +2,7 @@ use std::{
     future::{Future, poll_fn},
     io,
     pin::Pin,
-    task::{Context, Poll},
+    task::{Context, Poll, ready},
 };
 
 use bytes::Bytes;
diff --git a/quinn/src/runtime/async_io.rs b/quinn/src/runtime/async_io.rs
index 34df24d76..b862533ad 100644
--- a/quinn/src/runtime/async_io.rs
+++ b/quinn/src/runtime/async_io.rs
@@ -3,7 +3,7 @@ use std::{
     io,
     pin::Pin,
     sync::Arc,
-    task::{Context, Poll},
+    task::{Context, Poll, ready},
     time::Instant,
 };
 
diff --git a/quinn/src/runtime/tokio.rs b/quinn/src/runtime/tokio.rs
index 3a683217e..0e423660d 100644
--- a/quinn/src/runtime/tokio.rs
+++ b/quinn/src/runtime/tokio.rs
@@ -3,7 +3,7 @@ use std::{
     io,
     pin::Pin,
     sync::Arc,
-    task::{Context, Poll},
+    task::{Context, Poll, ready},
     time::Instant,
 };
 
diff --git a/quinn/src/send_stream.rs b/quinn/src/send_stream.rs
index b117d10a9..80fada81e 100644
--- a/quinn/src/send_stream.rs
+++ b/quinn/src/send_stream.rs
@@ -2,7 +2,7 @@ use std::{
     future::Future,
     io,
     pin::Pin,
-    task::{Context, Poll},
+    task::{Context, Poll, ready},
 };
 
 use bytes::Bytes;