vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Slight simplification by using .enumerate()

Browse source
This commit is contained in:
Ian Douglas Scott 2017-04-07 18:41:12 -07:00
parent e695897fe8
commit 691252e72c
No known key found for this signature in database
GPG key ID: 4924E10E199B5959
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
schemes/tcpd/src/main.rs
View file

@ -575,17 +575,15 @@ impl SchemeMut for Tcpd {
if ! handle.is_connected() { if ! handle.is_connected() {
return Err(Error::new(ENOTCONN)); return Err(Error::new(ENOTCONN));
} else if let Some((ip, mut tcp)) = handle.data.pop_front() { } else if let Some((ip, mut tcp)) = handle.data.pop_front() {
let mut i = 0; let len = std::cmp::min(buf.len(), tcp.data.len());
let mut len = std::cmp::min(buf.len(), tcp.data.len()); for (i, c) in tcp.data.drain(0..len).enumerate() {
for c in tcp.data.drain(0..len) {
buf[i] = c; buf[i] = c;
i += 1;
} }
if !tcp.data.is_empty() { if !tcp.data.is_empty() {
handle.data.push_front((ip, tcp)); handle.data.push_front((ip, tcp));
} }
return Ok(i); return Ok(len);
} else if handle.flags & O_NONBLOCK == O_NONBLOCK || handle.read_closed() { } else if handle.flags & O_NONBLOCK == O_NONBLOCK || handle.read_closed() {
return Ok(0); return Ok(0);
} else { } else {