WIP: bytes 0.5 compat

captured.rs is still broken, see NLnetLabs#42

Signed-off-by: Fabian Grünbichler <[email protected]>

Cargo.toml

@@ -12,7 +12,7 @@ license = "BSD-3-Clause"
 
 [dependencies]
 backtrace   = { version = "^0.3.15", optional = true }
-bytes       = "^0.4"
+bytes       = "^0.5"
 smallvec    = "^0.6.10"
 unwrap      = "^1.2.1"
 

src/decode/source.rs

@@ -125,7 +125,7 @@ impl Source for Bytes {
             Err(Error::Malformed)
         }
         else {
-            self.advance(len);
+            bytes::Buf::advance(self, len);
             Ok(())
         }
     }
@@ -135,7 +135,7 @@ impl Source for Bytes {
     }
 
     fn bytes(&self, start: usize, end: usize) -> Bytes {
-        self.slice(start, end)
+        self.slice(start..end)
     }
 }
 
@@ -161,7 +161,7 @@ impl<'a> Source for &'a [u8] {
     }
 
     fn bytes(&self, start: usize, end: usize) -> Bytes {
-        Bytes::from(&self[start..end])
+        Bytes::copy_from_slice(&self[start..end])
     }
 }
 

src/encode/primitive.rs

@@ -4,7 +4,8 @@
 //! parent.
 
 use std::io;
-use bytes::{BufMut, Bytes, BytesMut};
+use bytes::{Bytes, BytesMut};
+use bytes::buf::ext::BufMutExt;
 use crate::length::Length;
 use crate::mode::Mode;
 use crate::tag::Tag;

src/string/octet.rs

@@ -530,7 +530,8 @@ impl decode::Source for OctetStringSource {
     fn request(&mut self, len: usize) -> Result<usize, decode::Error> {
         if self.current.len() < len && !self.remainder.is_empty() {
             // Make a new current that is at least `len` long.
-            let mut current = BytesMut::from(self.current.clone());
+            let mut current = BytesMut::with_capacity(self.current.len());
+            current.extend_from_slice(&self.current.clone());
             while current.len() < len {
                 if let Some(bytes) = self.next_primitive() {
                     current.extend_from_slice(bytes.as_ref())
@@ -554,7 +555,7 @@ impl decode::Source for OctetStringSource {
                 }
             }
         }
-        self.current.advance(len);
+        self.current.advance(len)?;
         Ok(())
     }
 
@@ -563,7 +564,7 @@ impl decode::Source for OctetStringSource {
     }
 
     fn bytes(&self, start: usize, end: usize) -> Bytes {
-        self.current.slice(start, end)
+        self.current.slice(start..end)
     }
 }