Merge pull request jonhoo#28 from amilkov3/bytes-1.0

bytes 0.6 -> 1.0
ovr · Jan 5, 2021 · caa02b6 · caa02b6
2 parents dd00e01 + acd60dc
commit caa02b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ base64 = "0.13"
 bigdecimal = { version = "0.2", features = ["serde"] }
 bitflags = "1"
 byteorder = "1"
-bytes = "0.6.0"
+bytes = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 flate2 = { version = "1.0", default-features = false }
 lazy_static = "1"

diff --git a/src/proto/codec/mod.rs b/src/proto/codec/mod.rs
@@ -75,7 +75,7 @@ pub fn compress(
                 let mut read = 0;
                 loop {
                     dst.reserve(max(chunk.len().saturating_sub(read), 1));
-                    let dst_buf = &mut dst.bytes_mut()[7 + read..];
+                    let dst_buf = &mut dst.chunk_mut()[7 + read..];
                     match encoder.read(&mut *slice_from_raw_parts_mut(
                         dst_buf.as_mut_ptr(),
                         dst_buf.len(),
@@ -315,7 +315,7 @@ impl CompDecoder {
                             dst.reserve(plain_len.get());
                             unsafe {
                                 let mut decoder = ZlibDecoder::new(&src[..needed.get()]);
-                                let dst_buf = &mut dst.bytes_mut()[..plain_len.get()];
+                                let dst_buf = &mut dst.chunk_mut()[..plain_len.get()];
                                 decoder.read_exact(&mut *slice_from_raw_parts_mut(
                                     dst_buf.as_mut_ptr(),
                                     dst_buf.len(),

diff --git a/src/proto/sync_framed.rs b/src/proto/sync_framed.rs
@@ -152,8 +152,8 @@ where
                     None => unsafe {
                         self.in_buf.reserve(1);
                         match with_interrupt!(self.stream.read(&mut *slice_from_raw_parts_mut(
-                            self.in_buf.bytes_mut().as_mut_ptr(),
-                            self.in_buf.bytes_mut().len()
+                            self.in_buf.chunk_mut().as_mut_ptr(),
+                            self.in_buf.chunk_mut().len()
                         ))) {
                             Ok(0) => self.eof = true,
                             Ok(x) => {