From ccf44b4028345ae520e68c05e56ad9d167742c2b Mon Sep 17 00:00:00 2001
From: Sunil Nimmagadda <sunil@nimmagadda.net>
Date: Thu, 1 Feb 2024 16:51:45 +0530
Subject: Move to as_chunks.

Fuzz testing needs a nightly, so let's move to nightly everywhere.
---
 src/lib.rs    |  1 +
 src/vrrpv2.rs | 15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/lib.rs b/src/lib.rs
index ae2ba80..4c1bcff 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1 +1,2 @@
+#![feature(slice_as_chunks)]
 pub mod vrrpv2;
diff --git a/src/vrrpv2.rs b/src/vrrpv2.rs
index aabe60a..cae0f31 100644
--- a/src/vrrpv2.rs
+++ b/src/vrrpv2.rs
@@ -163,16 +163,13 @@ pub fn from_bytes(bytes: &[u8]) -> Result<VRRPv2, VRRPv2Error> {
     Ok(vrrpv2)
 }
 
-/// TODO: as_chunks is nicer but not stabilised yet.
 fn checksum(bytes: &[u8]) -> u16 {
-    let mut sum: u32 = 0;
-    for chunk in bytes.chunks(2) {
-        // Left over byte if any
-        if chunk.len() == 1 {
-            sum += u32::from(chunk[0]);
-        } else {
-            sum += u32::from(u16::from_be_bytes(chunk.try_into().unwrap()));
-        }
+    let (chunks, remainder) = bytes.as_chunks::<2>();
+    let mut sum = chunks
+        .iter()
+        .fold(0, |acc, x| acc + u32::from(u16::from_be_bytes(*x)));
+    if !remainder.is_empty() {
+        sum += u32::from(remainder[0]);
     }
     while (sum >> 16) > 0 {
         sum = (sum & 0xffff) + (sum >> 16);
-- 
cgit v1.2.3