From c3d56b85c318c3cdc164558c722b9440d443dcea Mon Sep 17 00:00:00 2001 From: Markus Westerlind Date: Thu, 30 Jan 2020 20:26:19 +0100 Subject: [PATCH] codec: use advance over split_to when data is not needed (#2198) --- tokio-util/src/codec/framed_write.rs | 5 ++--- tokio-util/src/codec/length_delimited.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tokio-util/src/codec/framed_write.rs b/tokio-util/src/codec/framed_write.rs index ca77b3d87..71b331fef 100644 --- a/tokio-util/src/codec/framed_write.rs +++ b/tokio-util/src/codec/framed_write.rs @@ -7,7 +7,7 @@ use tokio::{ stream::Stream, }; -use bytes::BytesMut; +use bytes::{Buf, BytesMut}; use futures_core::ready; use futures_sink::Sink; use log::trace; @@ -239,8 +239,7 @@ where .into())); } - // TODO: Add a way to `bytes` to do this w/o returning the drained data. - let _ = pinned.buffer.split_to(n); + pinned.buffer.advance(n); } // Try flushing the underlying IO diff --git a/tokio-util/src/codec/length_delimited.rs b/tokio-util/src/codec/length_delimited.rs index 01ba2aec0..04061c0ac 100644 --- a/tokio-util/src/codec/length_delimited.rs +++ b/tokio-util/src/codec/length_delimited.rs @@ -494,7 +494,7 @@ impl LengthDelimitedCodec { let num_skip = self.builder.get_num_skip(); if num_skip > 0 { - let _ = src.split_to(num_skip); + src.advance(num_skip); } // Ensure that the buffer has enough space to read the incoming