Update to Tokio and Bytes 1.0 (#504)
This commit is contained in:
@@ -202,10 +202,10 @@ where
|
||||
// could just use `poll_write_buf`...
|
||||
let n = if self.is_write_vectored {
|
||||
let mut bufs = [IoSlice::new(&[]); MAX_IOVS];
|
||||
let cnt = buf.bytes_vectored(&mut bufs);
|
||||
let cnt = buf.chunks_vectored(&mut bufs);
|
||||
ready!(Pin::new(&mut self.inner).poll_write_vectored(cx, &bufs[..cnt]))?
|
||||
} else {
|
||||
ready!(Pin::new(&mut self.inner).poll_write(cx, buf.bytes()))?
|
||||
ready!(Pin::new(&mut self.inner).poll_write(cx, buf.chunk()))?
|
||||
};
|
||||
buf.advance(n);
|
||||
}
|
||||
@@ -213,12 +213,12 @@ where
|
||||
tracing::trace!(queued_data_frame = false);
|
||||
let n = if self.is_write_vectored {
|
||||
let mut iovs = [IoSlice::new(&[]); MAX_IOVS];
|
||||
let cnt = self.buf.bytes_vectored(&mut iovs);
|
||||
let cnt = self.buf.chunks_vectored(&mut iovs);
|
||||
ready!(
|
||||
Pin::new(&mut self.inner).poll_write_vectored(cx, &mut iovs[..cnt])
|
||||
)?
|
||||
} else {
|
||||
ready!(Pin::new(&mut self.inner).poll_write(cx, &mut self.buf.bytes()))?
|
||||
ready!(Pin::new(&mut self.inner).poll_write(cx, &mut self.buf.chunk()))?
|
||||
};
|
||||
self.buf.advance(n);
|
||||
}
|
||||
|
||||
@@ -311,7 +311,7 @@ impl Decoder {
|
||||
|
||||
if huff {
|
||||
let ret = {
|
||||
let raw = &buf.bytes()[..len];
|
||||
let raw = &buf.chunk()[..len];
|
||||
huffman::decode(raw, &mut self.buffer).map(BytesMut::freeze)
|
||||
};
|
||||
|
||||
@@ -419,7 +419,7 @@ fn decode_int<B: Buf>(buf: &mut B, prefix_size: u8) -> Result<usize, DecoderErro
|
||||
|
||||
fn peek_u8<B: Buf>(buf: &mut B) -> Option<u8> {
|
||||
if buf.has_remaining() {
|
||||
Some(buf.bytes()[0])
|
||||
Some(buf.chunk()[0])
|
||||
} else {
|
||||
None
|
||||
}
|
||||
|
||||
@@ -847,8 +847,12 @@ where
|
||||
self.inner.remaining()
|
||||
}
|
||||
|
||||
fn bytes(&self) -> &[u8] {
|
||||
self.inner.bytes()
|
||||
fn chunk(&self) -> &[u8] {
|
||||
self.inner.chunk()
|
||||
}
|
||||
|
||||
fn chunks_vectored<'a>(&'a self, dst: &mut [std::io::IoSlice<'a>]) -> usize {
|
||||
self.inner.chunks_vectored(dst)
|
||||
}
|
||||
|
||||
fn advance(&mut self, cnt: usize) {
|
||||
|
||||
Reference in New Issue
Block a user