Upgrade to bytes 0.6 (#497)

* Upgrade to bytes 0.6

* Update Cargo.toml

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

* Update tests/h2-support/Cargo.toml

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

src/codec/framed_write.rs

@@ -3,7 +3,7 @@ use crate::codec::UserError::*;
 use crate::frame::{self, Frame, FrameSize};
 use crate::hpack;
 
-use bytes::{buf::BufMutExt, Buf, BufMut, BytesMut};
+use bytes::{buf::BufMut, Buf, BytesMut};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};

src/frame/headers.rs

@@ -10,7 +10,7 @@ use bytes::{Bytes, BytesMut};
 use std::fmt;
 use std::io::Cursor;
 
-type EncodeBuf<'a> = bytes::buf::ext::Limit<&'a mut BytesMut>;
+type EncodeBuf<'a> = bytes::buf::Limit<&'a mut BytesMut>;
 
 // Minimum MAX_FRAME_SIZE is 16kb, so save some arbitrary space for frame
 // head and other header bits.

src/hpack/encoder.rs

@@ -1,7 +1,7 @@
 use super::table::{Index, Table};
 use super::{huffman, Header};
 
-use bytes::{buf::ext::Limit, BufMut, BytesMut};
+use bytes::{buf::Limit, BufMut, BytesMut};
 use http::header::{HeaderName, HeaderValue};
 
 type DstBuf<'a> = Limit<&'a mut BytesMut>;
@@ -428,7 +428,7 @@ fn rewind(buf: &mut DstBuf<'_>, pos: usize) {
 mod test {
     use super::*;
     use crate::hpack::Header;
-    use bytes::buf::BufMutExt;
+    use bytes::buf::BufMut;
     use http::*;
 
     #[test]

src/hpack/test/fixture.rs

@@ -1,6 +1,6 @@
 use crate::hpack::{Decoder, Encoder, Header};
 
-use bytes::{buf::BufMutExt, BytesMut};
+use bytes::{buf::BufMut, BytesMut};
 use hex::FromHex;
 use serde_json::Value;
 

src/hpack/test/fuzz.rs

@@ -2,7 +2,7 @@ use crate::hpack::{Decoder, Encode, Encoder, Header};
 
 use http::header::{HeaderName, HeaderValue};
 
-use bytes::{buf::BufMutExt, Bytes, BytesMut};
+use bytes::{buf::BufMut, Bytes, BytesMut};
 use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
 use rand::{Rng, SeedableRng, StdRng};
 

src/proto/streams/prioritize.rs

@@ -6,7 +6,7 @@ use crate::frame::{Reason, StreamId};
 use crate::codec::UserError;
 use crate::codec::UserError::*;
 
-use bytes::buf::ext::{BufExt, Take};
+use bytes::buf::{Buf, Take};
 use std::io;
 use std::task::{Context, Poll, Waker};
 use std::{cmp, fmt, mem};