From 4b11c8c9d937d1fb2d42cd1acdc0a76d81f46ef1 Mon Sep 17 00:00:00 2001 From: asonix Date: Sat, 5 Jun 2021 11:46:26 -0500 Subject: [PATCH] Use zip rather than array indexing --- src/handshake.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/handshake.rs b/src/handshake.rs index ca4cf1b..ffabc7c 100644 --- a/src/handshake.rs +++ b/src/handshake.rs @@ -57,8 +57,8 @@ impl Handshake { } fn step_1(&mut self, input: &[u8; 32], serial: &mut SerialPort) -> Option<()> { - for (i, (c1, c2)) in input[..16].iter().zip(&input[16..]).enumerate() { - self.buffer[i] = c1 ^ c2; + for ((c1, c2), out) in input[..16].iter().zip(&input[16..]).zip(&mut self.buffer) { + *out = c1 ^ c2; } serial.write(&self.buffer).ok()?; @@ -71,7 +71,7 @@ impl Handshake { let mut succeeded = true; for ((c1, c2), c3) in input[..16].iter().zip(&input[16..]).zip(&self.buffer) { - succeeded = succeeded || *c1 == *c2 && *c1 == *c3; + succeeded = succeeded || c1 == c2 && c1 == c3; } succeeded