Restore Buf impl for Cursor

ntex-bytes/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.14] (2022-02-06)
+
+* Restore Buf impl for Cursor
+
 ## [0.1.13] (2022-02-04)
 
 * Remove unused impls for BytesMut and BytesVec

ntex-bytes/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-bytes"
-version = "0.1.13"
+version = "0.1.14"
 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-bytes/src/buf/buf_impl.rs

@@ -858,6 +858,39 @@ impl Buf for &str {
     }
 }
 
+impl<T: AsRef<[u8]>> Buf for std::io::Cursor<T> {
+    fn remaining(&self) -> usize {
+        let len = self.get_ref().as_ref().len();
+        let pos = self.position();
+
+        if pos >= len as u64 {
+            return 0;
+        }
+
+        len - pos as usize
+    }
+
+    fn chunk(&self) -> &[u8] {
+        let len = self.get_ref().as_ref().len();
+        let pos = self.position();
+
+        if pos >= len as u64 {
+            return &[];
+        }
+
+        &self.get_ref().as_ref()[pos as usize..]
+    }
+
+    fn advance(&mut self, cnt: usize) {
+        let pos = (self.position() as usize)
+            .checked_add(cnt)
+            .expect("overflow");
+
+        assert!(pos <= self.get_ref().as_ref().len());
+        self.set_position(pos as u64);
+    }
+}
+
 // The existence of this function makes the compiler catch if the Buf
 // trait is "object-safe" or not.
 fn _assert_trait_object(_b: &dyn Buf) {}
@@ -885,6 +918,15 @@ mod tests {
         buf.advance(1);
         assert_eq!(buf.chunk(), b"world");
 
+        let mut buf = std::io::Cursor::new(b" world");
+        assert_eq!(buf.remaining(), 6);
+        assert_eq!(buf.chunk(), b" world");
+        buf.advance(1);
+        assert_eq!(buf.chunk(), b"world");
+        buf.advance(5);
+        assert_eq!(buf.remaining(), 0);
+        assert_eq!(buf.chunk(), b"");
+
         let mut buf = &b"\x08 hello"[..];
         assert_eq!(8, buf.get_u8());
 

ntex/Cargo.toml

@@ -53,7 +53,7 @@ ntex-router = "0.5.1"
 ntex-service = "0.3.1"
 ntex-macros = "0.1.3"
 ntex-util = "0.1.13"
-ntex-bytes = "0.1.13"
+ntex-bytes = "0.1.14"
 ntex-tls = "0.1.3"
 ntex-rt = "0.4.3"
 ntex-io = "0.1.7"
@@ -72,7 +72,6 @@ polling = "2.2.0"
 pin-project-lite = "0.2"
 regex = { version = "1.5.4", default-features = false, features = ["std"] }
 sha-1 = "0.10"
-slab = "0.4"
 serde = { version = "1.0", features=["derive"] }
 socket2 = "0.4"
 thiserror = "1.0"