Port to event-listener v5.0

Cargo.toml

@@ -22,8 +22,8 @@ name = "broadcast_bench"
 [features]
 
 [dependencies]
-event-listener = "3"
-event-listener-strategy = "0.1.0"
+event-listener = "5.0.0"
+event-listener-strategy = "0.5.0"
 futures-core = "0.3.21"
 
 [dev-dependencies]

src/lib.rs

@@ -93,7 +93,7 @@
 //!
 #![forbid(unsafe_code)]
 #![deny(missing_debug_implementations, nonstandard_style, rust_2018_idioms)]
 #![warn(rustdoc::missing_doc_code_examples, unreachable_pub)]
 #![doc(
     html_favicon_url = "https://raw.githubusercontent.com/smol-rs/smol/master/assets/images/logo_fullsize_transparent.png"
 )]
@@ -785,7 +785,7 @@
     pos: u64,
 
     /// Listens for a send or close event to unblock this stream.
-    listener: Option<Pin<Box<EventListener>>>,
+    listener: Option<EventListener>,
 }
 
 impl<T> Receiver<T> {
@@ -1599,8 +1599,7 @@
 #[derive(Debug)]
 struct SendInner<'a, T> {
     sender: &'a Sender<T>,
-    // TODO: Remove the Pin<Box<>> at the next breaking release and make this type !Unpin
-    listener: Option<Pin<Box<EventListener>>>,
+    listener: Option<EventListener>,
     msg: Option<T>,
 }
 
@@ -1610,7 +1609,7 @@
     type Output = Result<Option<T>, SendError<T>>;
 
     fn poll_with_strategy<'x, S: event_listener_strategy::Strategy<'x>>(
-        self: Pin<&'x mut Self>,
+        self: Pin<&mut Self>,
         strategy: &mut S,
         context: &mut S::Context,
     ) -> Poll<Self::Output> {
@@ -1641,15 +1640,15 @@
             }
 
             // Sending failed - now start listening for notifications or wait for one.
-            match &mut this.listener {
+            match &this.listener {
                 None => {
                     // Start listening and then try sending again.
                     let inner = inner.write().unwrap();
                     this.listener = Some(inner.send_ops.listen());
                 }
-                Some(l) => {
+                Some(_) => {
                     // Wait for a notification.
-                    ready!(strategy.poll(l.as_mut(), context));
+                    ready!(strategy.poll(&mut this.listener, context));
                     this.listener = None;
                 }
             }
@@ -1668,7 +1667,7 @@
 #[derive(Debug)]
 struct RecvInner<'a, T> {
     receiver: &'a mut Receiver<T>,
-    listener: Option<Pin<Box<EventListener>>>,
+    listener: Option<EventListener>,
 }
 
 impl<'a, T> Unpin for RecvInner<'a, T> {}
@@ -1677,7 +1676,7 @@
     type Output = Result<T, RecvError>;
 
     fn poll_with_strategy<'x, S: event_listener_strategy::Strategy<'x>>(
-        self: Pin<&'x mut Self>,
+        self: Pin<&mut Self>,
         strategy: &mut S,
         context: &mut S::Context,
     ) -> Poll<Self::Output> {
@@ -1695,17 +1694,17 @@
             }
 
             // Receiving failed - now start listening for notifications or wait for one.
-            match &mut this.listener {
+            match &this.listener {
                 None => {
                     // Start listening and then try receiving again.
                     this.listener = {
                         let inner = this.receiver.inner.write().unwrap();
                         Some(inner.recv_ops.listen())
                     };
                 }
-                Some(l) => {
+                Some(_) => {
                     // Wait for a notification.
-                    ready!(strategy.poll(l.as_mut(), context));
+                    ready!(strategy.poll(&mut this.listener, context));
                     this.listener = None;
                 }
             }