From 5866014e75ff9264f898d408d0b33d7a47d19a50 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Tue, 1 Feb 2022 00:07:41 +0600
Subject: [PATCH] Make copy_from_slice universal

---
 ntex-bytes/src/bytes.rs        | 10 ++++++----
 ntex-bytes/tests/test_bytes.rs | 36 ++++++++++++++++++++++++++++++++++
 ntex/src/http/h1/dispatcher.rs |  4 ++++
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/ntex-bytes/src/bytes.rs b/ntex-bytes/src/bytes.rs
index 1daca513..bb3782ef 100644
--- a/ntex-bytes/src/bytes.rs
+++ b/ntex-bytes/src/bytes.rs
@@ -1937,17 +1937,19 @@ impl BytesVec {
     }
 
     /// Creates a new `BytesVec` from slice, by copying it.
-    pub fn copy_from_slice(src: &[u8]) -> Self {
+    pub fn copy_from_slice<T: AsRef<[u8]>>(src: T) -> Self {
         Self::copy_from_slice_in(src, PoolId::DEFAULT)
     }
 
     /// Creates a new `BytesVec` from slice, by copying it.
-    pub fn copy_from_slice_in<T>(src: &[u8], pool: T) -> Self
+    pub fn copy_from_slice_in<T, U>(src: T, pool: U) -> Self
     where
-        PoolRef: From<T>,
+        T: AsRef<[u8]>,
+        PoolRef: From<U>,
     {
+        let s = src.as_ref();
         BytesVec {
-            inner: InnerVec::from_slice(src.len(), src, pool.into()),
+            inner: InnerVec::from_slice(s.len(), s, pool.into()),
         }
     }
 
diff --git a/ntex-bytes/tests/test_bytes.rs b/ntex-bytes/tests/test_bytes.rs
index 2b1d97ef..1f7e1bb0 100644
--- a/ntex-bytes/tests/test_bytes.rs
+++ b/ntex-bytes/tests/test_bytes.rs
@@ -442,6 +442,15 @@ fn fns_defined_for_bytes() {
     let mut bytes = Bytes::from(&b"hello world"[..]);
     bytes.as_ptr();
 
+    assert!(bytes > "g");
+    assert!(bytes > "g".to_string());
+    assert!(bytes > "g".as_bytes().to_vec());
+    assert!(bytes > Bytes::from(&"g"[..]));
+    assert!("g" > bytes);
+    assert!("g".to_string() > bytes);
+    assert!("g".as_bytes().to_vec() > bytes);
+    assert!(Bytes::from(&"g"[..]) < bytes);
+
     assert_eq!(bytes, "hello world");
     assert_eq!(bytes, "hello world".as_bytes().to_vec());
     assert_eq!(bytes, "hello world".to_string());
@@ -450,6 +459,9 @@ fn fns_defined_for_bytes() {
     assert_eq!(bytes, BytesMut::copy_from_slice(b"hello world"));
 
     // Iterator
+    let v: Vec<u8> = (&bytes).iter().cloned().collect();
+    assert_eq!(&v[..], bytes);
+
     let v: Vec<u8> = bytes.as_ref().iter().cloned().collect();
     assert_eq!(&v[..], bytes);
 
@@ -470,6 +482,15 @@ fn fns_defined_for_bytes_mut() {
     bytes.as_ptr();
     bytes.as_mut_ptr();
 
+    assert!(bytes > "g");
+    assert!(bytes > "g".to_string());
+    assert!(bytes > "g".as_bytes().to_vec());
+    assert!(bytes > BytesMut::from(&"g"[..]));
+    assert!("g" > bytes);
+    assert!("g".to_string() > bytes);
+    assert!("g".as_bytes().to_vec() > bytes);
+    assert!(BytesMut::from(&"g"[..]) < bytes);
+
     assert_eq!(bytes, "hello world");
     assert_eq!(bytes, "hello world".as_bytes().to_vec());
     assert_eq!(bytes, "hello world".to_string());
@@ -478,6 +499,9 @@ fn fns_defined_for_bytes_mut() {
     assert_eq!(bytes, BytesVec::copy_from_slice(b"hello world"));
 
     // Iterator
+    let v: Vec<u8> = (&bytes).iter().cloned().collect();
+    assert_eq!(&v[..], bytes);
+
     let v: Vec<u8> = bytes.as_ref().iter().cloned().collect();
     assert_eq!(&v[..], bytes);
 
@@ -519,6 +543,15 @@ fn fns_defined_for_bytes_vec() {
     bytes.as_ptr();
     bytes.as_mut_ptr();
 
+    assert!(bytes > "g");
+    assert!(bytes > "g".to_string());
+    assert!(bytes > "g".as_bytes().to_vec());
+    assert!(bytes > BytesVec::copy_from_slice("g"));
+    assert!("g" > bytes);
+    assert!("g".to_string() > bytes);
+    assert!("g".as_bytes().to_vec() > bytes);
+    assert!(BytesVec::copy_from_slice(&"g"[..]) < bytes);
+
     assert_eq!(bytes, "hello world");
     assert_eq!(bytes, "hello world".as_bytes().to_vec());
     assert_eq!(bytes, "hello world".to_string());
@@ -527,6 +560,9 @@ fn fns_defined_for_bytes_vec() {
     assert_eq!(bytes, BytesMut::copy_from_slice(b"hello world"));
 
     // Iterator
+    let v: Vec<u8> = (&bytes).iter().cloned().collect();
+    assert_eq!(&v[..], bytes);
+
     let v: Vec<u8> = bytes.as_ref().iter().cloned().collect();
     assert_eq!(&v[..], bytes);
 
diff --git a/ntex/src/http/h1/dispatcher.rs b/ntex/src/http/h1/dispatcher.rs
index f7097844..133f1211 100644
--- a/ntex/src/http/h1/dispatcher.rs
+++ b/ntex/src/http/h1/dispatcher.rs
@@ -213,6 +213,10 @@ where
                                     buf.extend_from_slice(b"HTTP/1.1 100 Continue\r\n\r\n")
                                 });
                                 if result.is_err() {
+                                    log::error!(
+                                        "Expect handler returned error: {:?}",
+                                        result.err().unwrap()
+                                    );
                                     *this.st = State::Stop;
                                     this = self.as_mut().project();
                                     continue;