use ntex-bytes instead of bytes

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
   "ntex",
+  "ntex-bytes",
   "ntex-codec",
   "ntex-router",
   "ntex-rt",
@@ -11,6 +12,7 @@ members = [
 
 [patch.crates-io]
 ntex = { path = "ntex" }
+ntex-bytes = { path = "ntex-bytes" }
 ntex-codec = { path = "ntex-codec" }
 ntex-router = { path = "ntex-router" }
 ntex-rt = { path = "ntex-rt" }

ntex-bytes/CHANGELOG.md

@@ -1,6 +1,6 @@
-# 0.5.0 (06-25-2021)
+# 0.1.0 (2021-07-xx)
 
-* Initial fork
+* Project fork
 
 # 0.4.12 (March 6, 2019)
 

ntex-bytes/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "ntex-bytes"
-version = "0.5.0"
+version = "0.1.0"
 license = "MIT"
 authors = ["Carl Lerche <me@carllerche.com>"]
 description = "Types and traits for working with bytes (bytes crate fork)"
 documentation = "https://docs.rs/ntex-bytes"
-repository = "https://github.com/ntex/bytes"
+repository = "https://github.com/ntex-rs/ntex-bytes"
 readme = "README.md"
 keywords = ["buffers", "zero-copy", "io"]
 categories = ["network-programming", "data-structures"]

ntex-codec/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.5.0] - 2021-07-xx
+
+* Use ntex-bytes stead of bytes
+
 ## [0.4.1] - 2021-04-04
 
 * Use Either from ntex-service

ntex-codec/Cargo.toml

@@ -17,7 +17,7 @@ path = "src/lib.rs"
 
 [dependencies]
 bitflags = "1.2.1"
-ntex-bytes = "0.5"
+ntex-bytes = "0.1.0"
 ntex-util = "0.1.0"
 log = "0.4"
 tokio = { version = "1", default-features = false }

ntex-router/CHANGES.txt

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.5.0] - 2021-07-xx
+
+* Use ntex-bytes instead of bytestring
+
 ## [0.4.4] - 2021-06-14
 
 * Fix search order for normal and prefix paths

ntex-router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-router"
-version = "0.4.4"
+version = "0.5.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Path router"
 keywords = ["ntex"]
@@ -18,7 +18,7 @@ default = ["http"]
 
 [dependencies]
 serde = "1.0"
-bytestring = "1.0"
+ntex-bytes = "0.1"
 log = "0.4"
 http = { version = "0.2", optional = true }
 regex = { version = "1.5.4", default-features = false, features = ["std"] }

ntex-router/src/lib.rs

@@ -39,7 +39,7 @@ impl<'a> ResourcePath for &'a str {
     }
 }
 
-impl ResourcePath for bytestring::ByteString {
+impl ResourcePath for ntex_bytes::ByteString {
     fn path(&self) -> &str {
         &*self
     }

ntex/CHANGES.md

@@ -1,6 +1,8 @@
 # Changes
 
-## [0.3.19] - 2021-07-xx
+## [0.4.0] - 2021-07-xx
+
+* use ntex-bytes instead of bytes
 
 * drop direct tokio dependency
 

ntex/Cargo.toml

@@ -43,18 +43,17 @@ http-framework = ["h2", "http", "httparse",
     "httpdate", "encoding_rs", "mime", "percent-encoding", "serde_json", "serde_urlencoded"]
 
 [dependencies]
-ntex-codec = "0.4.1"
+ntex-codec = "0.5.0"
 ntex-rt = "0.2.2"
-ntex-router = "0.4.4"
+ntex-router = "0.5.0"
 ntex-service = "0.1.9"
 ntex-macros = "0.1.3"
 ntex-util = "0.1.1"
+ntex-bytes = "0.1.0"
 
 ahash = "0.7.4"
 base64 = "0.13"
 bitflags = "1.2"
-bytes = "1.0"
-bytestring = { version = "1.0", features = ["serde"] }
 derive_more = "0.99.14"
 futures-core = { version = "0.3.15", default-features = false, features = ["alloc"] }
 futures-sink = { version = "0.3.15", default-features = false, features = ["alloc"] }

ntex/src/http/client/pool.rs

@@ -2,7 +2,7 @@ use std::task::{Context, Poll};
 use std::time::{Duration, Instant};
 use std::{cell::RefCell, collections::VecDeque, future::Future, pin::Pin, rc::Rc};
 
-use h2::client::{handshake, Connection, SendRequest};
+use h2::client::{Builder, Connection, SendRequest};
 use http::uri::Authority;
 
 use crate::channel::pool;
@@ -535,7 +535,7 @@ where
                     Poll::Ready(())
                 } else {
                     // init http2 handshake
-                    this.h2 = Some(Box::pin(handshake(io)));
+                    this.h2 = Some(Box::pin(Builder::new().handshake(io)));
                     self.poll(cx)
                 }
             }

ntex/src/http/error.rs

@@ -10,7 +10,7 @@ pub use http::Error as HttpError;
 use crate::http::body::Body;
 use crate::http::response::Response;
 use crate::rt::task::JoinError;
-use crate::util::Either;
+use crate::util::{BytesMut, Either};
 
 /// Error that can be converted to `Response`
 pub trait ResponseError: fmt::Display + fmt::Debug {
@@ -19,7 +19,7 @@ pub trait ResponseError: fmt::Display + fmt::Debug {
     /// Internal server error is generated by default.
     fn error_response(&self) -> Response {
         let mut resp = Response::new(StatusCode::INTERNAL_SERVER_ERROR);
-        let mut buf = bytes::BytesMut::new();
+        let mut buf = BytesMut::new();
         let _ = write!(crate::http::helpers::Writer(&mut buf), "{}", self);
         resp.headers_mut().insert(
             header::CONTENT_TYPE,

ntex/src/http/h1/encoder.rs

@@ -114,7 +114,7 @@ pub(super) trait MessageType: Sized {
         let mut pos = 0;
         let mut has_date = false;
         let mut remaining = dst.capacity() - dst.len();
-        let mut buf = dst.chunk_mut().as_mut_ptr() as *mut u8;
+        let mut buf = unsafe { dst.chunk_mut().as_mut_ptr() as *mut u8 };
         for (key, value) in headers {
             match *key {
                 CONNECTION => continue,

ntex/src/http/h2/mod.rs

@@ -38,7 +38,7 @@ impl Stream for Payload {
                 if let Err(err) = this.pl.flow_control().release_capacity(len) {
                     Poll::Ready(Some(Err(err.into())))
                 } else {
-                    Poll::Ready(Some(Ok(chunk)))
+                    Poll::Ready(Some(Ok(Bytes::copy_from_slice(&chunk[..]))))
                 }
             }
             Poll::Ready(Some(Err(err))) => Poll::Ready(Some(Err(err.into()))),

ntex/src/http/h2/service.rs

@@ -265,7 +265,7 @@ where
                 self.config.clone(),
                 addr,
                 self.on_connect.as_ref().map(|f| f(&io)),
-                server::handshake(io),
+                server::Builder::new().handshake(io),
             ),
         }
     }

ntex/src/http/service.rs

@@ -515,7 +515,7 @@ where
             Protocol::Http2 => HttpServiceHandlerResponse {
                 state: ResponseState::H2Handshake {
                     data: Some((
-                        server::handshake(io),
+                        server::Builder::new().handshake(io),
                         self.config.clone(),
                         on_connect,
                         peer_addr,

ntex/src/util/mod.rs

@@ -11,8 +11,7 @@ pub mod variant;
 
 pub use self::extensions::Extensions;
 
-pub use bytes::{Buf, BufMut, Bytes, BytesMut};
-pub use bytestring::ByteString;
+pub use ntex_bytes::{Buf, BufMut, ByteString, Bytes, BytesMut};
 pub use ntex_util::future::*;
 
 pub type HashMap<K, V> = std::collections::HashMap<K, V, ahash::RandomState>;

ntex/src/ws/codec.rs

@@ -117,7 +117,7 @@ impl Encoder for Codec {
         match item {
             Message::Text(txt) => Parser::write_message(
                 dst,
-                txt,
+                txt.as_ref(),
                 OpCode::Text,
                 true,
                 !self.flags.get().contains(Flags::SERVER),