Update ntex-bytes (#23)

Author: fafhrd91

.github/workflows/linux.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - 1.85.0 # MSRV
+          - 1.86.0 # MSRV
           - stable
           - nightly
 
@@ -42,7 +42,7 @@ jobs:
           key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo tarpaulin
-        if: matrix.version == '1.85.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.86.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         uses: actions/cache@v4
         with:
           path: ~/.cargo/bin
@@ -56,19 +56,19 @@ jobs:
           args: --all --all-features --no-fail-fast -- --nocapture
 
       - name: Install tarpaulin
-        if: matrix.version == '1.85.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.86.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         continue-on-error: true
         run: |
           cargo install cargo-tarpaulin
 
       - name: Generate coverage report
-        if: matrix.version == '1.85.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.86.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         continue-on-error: true
         run: |
           cargo tarpaulin --out Xml --all --all-features
 
       - name: Upload to Codecov
-        if: matrix.version == '1.85.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.86.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         continue-on-error: true
         uses: codecov/codecov-action@v1
         with:

ntex-files/Cargo.toml

@@ -18,7 +18,7 @@ name = "ntex_files"
 path = "src/lib.rs"
 
 [dependencies]
-ntex = "3.0.0-pre.6"
+ntex = "3.0.0-pre.10"
 ntex-http = "1"
 bitflags = "2"
 futures = "0.3"

ntex-identity/Cargo.toml

@@ -22,7 +22,7 @@ default = ["cookie-policy"]
 cookie-policy = ["cookie/secure", "ntex/cookie"]
 
 [dependencies]
-ntex = "3.0.0-pre.9"
+ntex = "3.0.0-pre.10"
 futures = "0.3"
 serde = "1.0"
 serde_json = "1.0"

ntex-multipart/Cargo.toml

@@ -17,7 +17,7 @@ name = "ntex_multipart"
 path = "src/lib.rs"
 
 [dependencies]
-ntex = "3.0.0-pre.6"
+ntex = "3.0.0-pre.10"
 derive_more = { version = "2", features = ["from", "display"] }
 httparse = "1.3"
 futures = "0.3"

ntex-multipart/src/server.rs

@@ -507,7 +507,7 @@ impl InnerField {
                 // check if we have enough data for boundary detection
                 if cur + 4 > len {
                     if cur > 0 {
-                        Poll::Ready(Some(Ok(payload.buf.split_to(cur).freeze())))
+                        Poll::Ready(Some(Ok(payload.buf.split_to_bytes(cur))))
                     } else {
                         Poll::Pending
                     }
@@ -520,7 +520,7 @@ impl InnerField {
                     {
                         if cur != 0 {
                             // return buffer
-                            Poll::Ready(Some(Ok(payload.buf.split_to(cur).freeze())))
+                            Poll::Ready(Some(Ok(payload.buf.split_to_bytes(cur))))
                         } else {
                             pos = cur + 1;
                             continue;
@@ -532,7 +532,7 @@ impl InnerField {
                     }
                 }
             } else {
-                Poll::Ready(Some(Ok(payload.buf.split().freeze())))
+                Poll::Ready(Some(Ok(payload.buf.take_bytes())))
             };
         }
     }
@@ -692,13 +692,13 @@ impl PayloadBuffer {
     /// Read exact number of bytes
     #[cfg(test)]
     fn read_exact(&mut self, size: usize) -> Option<Bytes> {
-        if size <= self.buf.len() { Some(self.buf.split_to(size).freeze()) } else { None }
+        if size <= self.buf.len() { Some(self.buf.split_to_bytes(size)) } else { None }
     }
 
     fn read_max(&mut self, size: u64) -> Result<Option<Bytes>, MultipartError> {
         if !self.buf.is_empty() {
             let size = std::cmp::min(self.buf.len() as u64, size) as usize;
-            Ok(Some(self.buf.split_to(size).freeze()))
+            Ok(Some(self.buf.split_to_bytes(size)))
         } else if self.eof {
             Err(MultipartError::Incomplete)
         } else {
@@ -709,7 +709,7 @@ impl PayloadBuffer {
     /// Read until specified ending
     pub fn read_until(&mut self, line: &[u8]) -> Result<Option<Bytes>, MultipartError> {
         let res = twoway::find_bytes(&self.buf, line)
-            .map(|idx| self.buf.split_to(idx + line.len()).freeze());
+            .map(|idx| self.buf.split_to_bytes(idx + line.len()));
 
         if res.is_none() && self.eof { Err(MultipartError::Incomplete) } else { Ok(res) }
     }
@@ -722,7 +722,7 @@ impl PayloadBuffer {
     /// Read bytes until new line delimiter or eof
     pub fn readline_or_eof(&mut self) -> Result<Option<Bytes>, MultipartError> {
         match self.readline() {
-            Err(MultipartError::Incomplete) if self.eof => Ok(Some(self.buf.split().freeze())),
+            Err(MultipartError::Incomplete) if self.eof => Ok(Some(self.buf.take_bytes())),
             line => line,
         }
     }

ntex-session/Cargo.toml

@@ -23,7 +23,7 @@ default = ["cookie-session"]
 cookie-session = ["cookie/secure", "ntex/cookie"]
 
 [dependencies]
-ntex = "3.0.0-pre.9"
+ntex = "3.0.0-pre.10"
 cookie = "0.18"
 derive_more = { version = "2", features = ["from", "display"] }
 futures = "0.3"