util: upgrade tokio-util to bytes 0.6 (#3052)

This commit is contained in:
Dirkjan Ochtman
2020-10-27 09:30:29 +01:00
committed by GitHub
parent 6d0ba19af5
commit fe2b997675
11 changed files with 112 additions and 238 deletions
+2 -4
View File
@@ -2,7 +2,7 @@ use crate::codec::decoder::Decoder;
use crate::codec::encoder::Encoder;
use tokio::{
io::{AsyncRead, AsyncWrite},
io::{AsyncRead, AsyncReadExt, AsyncWrite},
stream::Stream,
};
@@ -118,8 +118,6 @@ where
type Item = Result<U::Item, U::Error>;
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
use crate::util::poll_read_buf;
let mut pinned = self.project();
let state: &mut ReadFrame = pinned.state.borrow_mut();
loop {
@@ -150,7 +148,7 @@ where
// got room for at least one byte to read to ensure that we don't
// get a spurious 0 that looks like EOF
state.buffer.reserve(1);
let bytect = match poll_read_buf(cx, pinned.inner.as_mut(), &mut state.buffer)? {
let bytect = match pinned.inner.as_mut().poll_read_buf(&mut state.buffer, cx)? {
Poll::Ready(ct) => ct,
Poll::Pending => return Poll::Pending,
};