move mpsc to ntex-util

ntex-bytes/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.8] (2021-12-18)
+
+* Remove futures patch dependency
+
 ## [0.1.7] (2021-12-06)
 
 * Fix dealloc for vec representation

ntex-bytes/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-bytes"
-version = "0.1.7"
+version = "0.1.8"
 license = "MIT"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Carl Lerche <me@carllerche.com>"]
 description = "Types and traits for working with bytes (bytes crate fork)"

ntex-codec/CHANGES.md

@@ -1,10 +1,10 @@
 # Changes
 
-## [0.6.0] - 2021-12-xx
+## [0.6.0] - 2021-12-18
 
-* Removed Framed type
+* Remove Framed type
 
-* Removed tokio dependency
+* Remove tokio dependency
 
 ## [0.5.1] - 2021-09-08
 

ntex-io/Cargo.toml

@@ -34,7 +34,7 @@ ntex-service = "0.2.1"
 log = "0.4"
 pin-project-lite = "0.2"
 
-tok-io = { version = "1", package = "tokio", default-features = false, optional = true }
+tok-io = { version = "1", package = "tokio", default-features = false, features = ["net", "rt"], optional = true }
 
 [dev-dependencies]
 ntex = "0.5.0-b.0"

ntex-util/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.3] - 2021-12-18
+
+* move ntex::channel::mpsc
+
 ## [0.1.2] - 2021-12-10
 
 * move in ntex::time utils

ntex-util/src/channel/cell.rs

@@ -1,6 +1,5 @@
 //! Custom cell impl
-
-use std::{cell::UnsafeCell, fmt, rc::Rc};
+use std::{cell::UnsafeCell, fmt, rc::Rc, rc::Weak};
 
 pub(super) struct Cell<T> {
     inner: Rc<UnsafeCell<T>>,
@@ -39,4 +38,28 @@ impl<T> Cell<T> {
     pub(super) fn get_mut(&self) -> &mut T {
         unsafe { &mut *self.inner.as_ref().get() }
     }
+
+    pub(super) fn downgrade(&self) -> WeakCell<T> {
+        WeakCell {
+            inner: Rc::downgrade(&self.inner),
+        }
+    }
+}
+
+pub(super) struct WeakCell<T> {
+    inner: Weak<UnsafeCell<T>>,
+}
+
+impl<T> Clone for WeakCell<T> {
+    fn clone(&self) -> Self {
+        Self {
+            inner: self.inner.clone(),
+        }
+    }
+}
+
+impl<T> WeakCell<T> {
+    pub(super) fn upgrade(&self) -> Option<Cell<T>> {
+        self.inner.upgrade().map(|inner| Cell { inner })
+    }
 }

ntex-util/src/channel/mod.rs

@@ -2,6 +2,7 @@
 
 mod cell;
 pub mod condition;
+pub mod mpsc;
 pub mod oneshot;
 pub mod pool;
 

ntex/src/channel/cell.rs

@@ -1,68 +0,0 @@
-//! Custom cell impl
-
-use std::cell::UnsafeCell;
-use std::fmt;
-use std::rc::{Rc, Weak};
-
-pub(super) struct Cell<T> {
-    inner: Rc<UnsafeCell<T>>,
-}
-
-impl<T> Clone for Cell<T> {
-    fn clone(&self) -> Self {
-        Self {
-            inner: self.inner.clone(),
-        }
-    }
-}
-
-impl<T: fmt::Debug> fmt::Debug for Cell<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
-impl<T> Cell<T> {
-    pub(super) fn new(inner: T) -> Self {
-        Self {
-            inner: Rc::new(UnsafeCell::new(inner)),
-        }
-    }
-
-    pub(super) fn strong_count(&self) -> usize {
-        Rc::strong_count(&self.inner)
-    }
-
-    pub(super) fn get_ref(&self) -> &T {
-        unsafe { &*self.inner.as_ref().get() }
-    }
-
-    #[allow(clippy::mut_from_ref)]
-    pub(super) fn get_mut(&self) -> &mut T {
-        unsafe { &mut *self.inner.as_ref().get() }
-    }
-
-    pub(super) fn downgrade(&self) -> WeakCell<T> {
-        WeakCell {
-            inner: Rc::downgrade(&self.inner),
-        }
-    }
-}
-
-pub(super) struct WeakCell<T> {
-    inner: Weak<UnsafeCell<T>>,
-}
-
-impl<T> Clone for WeakCell<T> {
-    fn clone(&self) -> Self {
-        Self {
-            inner: self.inner.clone(),
-        }
-    }
-}
-
-impl<T> WeakCell<T> {
-    pub(super) fn upgrade(&self) -> Option<Cell<T>> {
-        self.inner.upgrade().map(|inner| Cell { inner })
-    }
-}

ntex/src/channel/mod.rs

@@ -1,5 +0,0 @@
-//! Communication primitives
-
-mod cell;
-pub mod mpsc;
-pub use ntex_util::channel::*;

ntex/src/lib.rs

@@ -32,7 +32,7 @@ pub use ntex_macros::{rt_main as main, rt_test as test};
 #[cfg(test)]
 pub(crate) use ntex_macros::rt_test2 as rt_test;
 
-pub mod channel;
+//pub mod channel;
 pub mod connect;
 pub mod http;
 pub mod server;
@@ -48,6 +48,7 @@ pub use self::service::{
 
 pub use futures_core::stream::Stream;
 pub use futures_sink::Sink;
+pub use ntex_util::channel;
 pub use ntex_util::task;
 
 pub mod codec {