From 691252e72ca828dc99267c6941d8f9e1eb067553 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Fri, 7 Apr 2017 18:41:12 -0700 Subject: [PATCH] Slight simplification by using .enumerate() --- schemes/tcpd/src/main.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/schemes/tcpd/src/main.rs b/schemes/tcpd/src/main.rs index 6bd53bc..6660563 100644 --- a/schemes/tcpd/src/main.rs +++ b/schemes/tcpd/src/main.rs @@ -575,17 +575,15 @@ impl SchemeMut for Tcpd { if ! handle.is_connected() { return Err(Error::new(ENOTCONN)); } else if let Some((ip, mut tcp)) = handle.data.pop_front() { - let mut i = 0; - let mut len = std::cmp::min(buf.len(), tcp.data.len()); - for c in tcp.data.drain(0..len) { + let len = std::cmp::min(buf.len(), tcp.data.len()); + for (i, c) in tcp.data.drain(0..len).enumerate() { buf[i] = c; - i += 1; } if !tcp.data.is_empty() { handle.data.push_front((ip, tcp)); } - return Ok(i); + return Ok(len); } else if handle.flags & O_NONBLOCK == O_NONBLOCK || handle.read_closed() { return Ok(0); } else {