Update bytes to v0.6

Cargo.toml

@@ -23,7 +23,7 @@ include = [
 ]
 
 [dependencies]
-bytes = "0.5"
+bytes = "0.6"
 futures-core = { version = "0.3", default-features = false }
 futures-channel = "0.3"
 futures-util = { version = "0.3", default-features = false }
@@ -64,7 +64,7 @@ tokio = { version = "0.3", features = [
     "test-util",
 ] }
 tokio-test = "0.3"
-tokio-util = { version = "0.4", features = ["codec"] }
+tokio-util = { version = "0.5", features = ["codec"] }
 tower-util = "0.3"
 url = "1.0"
 
@@ -244,3 +244,10 @@ required-features = ["runtime", "stream"]
 name = "server"
 path = "tests/server.rs"
 required-features = ["runtime"]
+
+[patch.crates-io]
+http = { git = "https://github.com/olix0r/http", branch = "ver/bytes-0.6" }
+http-body = { git = "https://github.com/olix0r/http-body", branch = "ver/bytes-0.6" }
+
+[patch."https://github.com/hyperium/h2"]
+h2 = { git = "https://github.com/olix0r/h2", branch = "ver/bytes-0.6" }

examples/client_json.rs

@@ -4,7 +4,7 @@
 #[macro_use]
 extern crate serde_derive;
 
-use bytes::buf::BufExt as _;
+use bytes::Buf as _;
 use hyper::Client;
 
 // A simple type alias so as to DRY.

examples/web_api.rs

@@ -1,6 +1,6 @@
 #![deny(warnings)]
 
-use bytes::buf::BufExt;
+use bytes::Buf;
 use futures_util::{stream, StreamExt};
 use hyper::client::HttpConnector;
 use hyper::service::{make_service_fn, service_fn};

src/body/to_bytes.rs

@@ -23,7 +23,7 @@ where
     let second = if let Some(buf) = body.data().await {
         buf?
     } else {
-        return Ok(first.to_bytes());
+        return Ok(first.copy_to_bytes(first.remaining()));
     };
 
     // With more than 1 buf, we gotta flatten into a Vec first.

src/proto/h1/encode.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 use std::io::IoSlice;
 
-use bytes::buf::ext::{BufExt, Chain, Take};
+use bytes::buf::{Chain, Take};
 use bytes::Buf;
 
 use super::io::WriteBuf;

src/proto/h1/io.rs

@@ -2,6 +2,7 @@ use std::cell::Cell;
 use std::cmp;
 use std::fmt;
 use std::io::{self, IoSlice};
+use std::mem::MaybeUninit;
 
 use bytes::{Buf, BufMut, Bytes, BytesMut};
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
@@ -188,7 +189,11 @@ where
         if self.read_buf_remaining_mut() < next {
             self.read_buf.reserve(next);
         }
-        let mut buf = ReadBuf::uninit(&mut self.read_buf.bytes_mut()[..]);
+        let dst = self.read_buf.bytes_mut();
+        // Safety: `dst` may include uninitialized memory, but `ReadBuf` will
+        // never uninitialize memory that has already been initialized.
+        let dst = unsafe { &mut *(dst as *mut _ as *mut [MaybeUninit<u8>]) };
+        let mut buf = ReadBuf::uninit(dst);
         match Pin::new(&mut self.io).poll_read(cx, &mut buf) {
             Poll::Ready(Ok(_)) => {
                 let n = buf.filled().len();