Upgrade async-channel (#236)

ntex-io/src/io.rs

@@ -855,8 +855,8 @@ impl Future for OnDisconnect {
 
 #[cfg(test)]
 mod tests {
-    use ntex_codec::BytesCodec;
     use ntex_bytes::Bytes;
+    use ntex_codec::BytesCodec;
 
     use super::*;
     use crate::testing::IoTest;
@@ -891,7 +891,11 @@ mod tests {
         let server = Io::new(server);
         assert!(server.eq(&server));
 
-        server.send(Bytes::from_static(b"GET /test HTTP/1"), &BytesCodec).await.ok().unwrap();
+        server
+            .send(Bytes::from_static(b"GET /test HTTP/1"), &BytesCodec)
+            .await
+            .ok()
+            .unwrap();
         let item = client.read_any();
         assert_eq!(item, "GET /test HTTP/1");
     }

ntex-rt/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.4.10] - 2023-11-02
+
+* Upgrade async-channel to 2.0
+
 ## [0.4.9] - 2023-04-11
 
 * Chore upgrade glommio to 0.8

ntex-rt/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-rt"
-version = "0.4.9"
+version = "0.4.10"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "ntex runtime"
 keywords = ["network", "framework", "async", "futures"]
@@ -28,8 +28,8 @@ tokio = ["tok-io"]
 async-std = ["async_std/unstable"]
 
 [dependencies]
-async-oneshot = "0.5.0"
+async-oneshot = "0.5"
-async-channel = "1.8.0"
+async-channel = "2.0"
 futures-core = "0.3"
 log = "0.4"
 

ntex-rt/src/arbiter.rs

@@ -14,6 +14,9 @@ thread_local!(
     static STORAGE: RefCell<HashMap<TypeId, Box<dyn Any>>> = RefCell::new(HashMap::new());
 );
 
+type ServerCommandRx = Pin<Box<dyn Stream<Item = SystemCommand>>>;
+type ArbiterCommandRx = Pin<Box<dyn Stream<Item = ArbiterCommand>>>;
+
 pub(super) static COUNT: AtomicUsize = AtomicUsize::new(0);
 
 pub(super) enum ArbiterCommand {
@@ -57,7 +60,13 @@ impl Arbiter {
         ADDR.with(|cell| *cell.borrow_mut() = Some(arb.clone()));
         STORAGE.with(|cell| cell.borrow_mut().clear());
 
-        (arb, ArbiterController { stop: None, rx })
+        (
+            arb,
+            ArbiterController {
+                stop: None,
+                rx: Box::pin(rx),
+            },
+        )
     }
 
     /// Returns the current thread's arbiter's address. If no Arbiter is present, then this
@@ -97,7 +106,7 @@ impl Arbiter {
                     // start arbiter controller
                     crate::spawn(ArbiterController {
                         stop: Some(stop),
-                        rx: arb_rx,
+                        rx: Box::pin(arb_rx),
                     });
                     ADDR.with(|cell| *cell.borrow_mut() = Some(arb.clone()));
 
@@ -231,7 +240,7 @@ impl Arbiter {
 
 pub(crate) struct ArbiterController {
     stop: Option<oneshot::Sender<i32>>,
-    rx: Receiver<ArbiterCommand>,
+    rx: ArbiterCommandRx,
 }
 
 impl Drop for ArbiterController {
@@ -281,10 +290,9 @@ pub(super) enum SystemCommand {
     UnregisterArbiter(usize),
 }
 
-#[derive(Debug)]
 pub(super) struct SystemArbiter {
     stop: Option<oneshot::Sender<i32>>,
-    commands: Receiver<SystemCommand>,
+    commands: ServerCommandRx,
     arbiters: HashMap<usize, Arbiter>,
 }
 
@@ -294,13 +302,21 @@ impl SystemArbiter {
         commands: Receiver<SystemCommand>,
     ) -> Self {
         SystemArbiter {
-            commands,
+            commands: Box::pin(commands),
             stop: Some(stop),
             arbiters: HashMap::new(),
         }
     }
 }
 
+impl fmt::Debug for SystemArbiter {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("SystemArbiter")
+            .field("arbiters", &self.arbiters)
+            .finish()
+    }
+}
+
 impl Future for SystemArbiter {
     type Output = ();
 

ntex/Cargo.toml

@@ -57,19 +57,19 @@ ntex-macros = "0.1.3"
 ntex-util = "0.3.3"
 ntex-bytes = "0.1.19"
 ntex-h2 = "0.4.3"
-ntex-rt = "0.4.9"
+ntex-rt = "0.4.10"
 ntex-io = "0.3.4"
 ntex-tls = "0.3.1"
 ntex-tokio = { version = "0.3.0", optional = true }
 ntex-glommio = { version = "0.3.0", optional = true }
 ntex-async-std = { version = "0.3.0", optional = true }
 
-async-oneshot = "0.5.0"
+async-oneshot = "0.5"
-async-channel = "2.0.0"
+async-channel = "2.0"
 base64 = "0.21"
 bitflags = "2.4"
 log = "0.4"
-nanorand = { version = "0.7.0", default-features = false, features = ["std", "wyrand"] }
+nanorand = { version = "0.7", default-features = false, features = ["std", "wyrand"] }
 polling = "3.3"
 pin-project-lite = "0.2"
 regex = { version = "1.10.1", default-features = false, features = ["std"] }
@@ -79,7 +79,7 @@ socket2 = "0.5"
 thiserror = "1.0"
 
 # http/web framework
-httparse = "1.8.0"
+httparse = "1.8"
 httpdate = "1.0"
 encoding_rs = "0.8"
 mime = "0.3"