From 760ae89401d9addb71ebf19674980577b5501edd Mon Sep 17 00:00:00 2001 From: bdonlan Date: Thu, 24 Sep 2020 14:50:10 -0700 Subject: chore: Use IoSlice's Copy impl to clean up some repetitive code (#2875) As we go into 0.3 we no longer need to support older versions of Rust where IoSlice did not implement Copy and Clone, so we can more easily initialize the IoSlice array in net::tcp::stream. Co-authored-by: Bryan Donlan --- tokio/src/net/tcp/stream.rs | 68 +-------------------------------------------- 1 file changed, 1 insertion(+), 67 deletions(-) (limited to 'tokio/src/net/tcp/stream.rs') diff --git a/tokio/src/net/tcp/stream.rs b/tokio/src/net/tcp/stream.rs index f4f705b4..467d09fc 100644 --- a/tokio/src/net/tcp/stream.rs +++ b/tokio/src/net/tcp/stream.rs @@ -762,73 +762,7 @@ impl TcpStream { static S: &[u8] = &[0]; const MAX_BUFS: usize = 64; - // IoSlice isn't Copy, so we must expand this manually ;_; - let mut slices: [IoSlice<'_>; MAX_BUFS] = [ - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - IoSlice::new(S), - ]; + let mut slices: [IoSlice<'_>; MAX_BUFS] = [IoSlice::new(S); 64]; let cnt = buf.bytes_vectored(&mut slices); let iovec = <&IoVec>::from(S); -- cgit v1.2.3