From 52f23fa268b91d0825c7f7f1dbc217aac8ec2f9f Mon Sep 17 00:00:00 2001
From: Alexander Wagner <alexander.wagner@ulal.de>
Date: Tue, 4 Jan 2022 00:26:24 +0100
Subject: [PATCH] Delete not needed macros

---
 k12/src/lanes.rs | 21 ---------------------
 k12/src/lib.rs   | 20 ++++++--------------
 2 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 k12/src/lanes.rs

diff --git a/k12/src/lanes.rs b/k12/src/lanes.rs
deleted file mode 100644
index 810b7879c..000000000
--- a/k12/src/lanes.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-#![allow(clippy::unreadable_literal)]
-
-macro_rules! REPEAT4 {
-    ($e: expr) => {
-        $e;
-        $e;
-        $e;
-        $e;
-    };
-}
-
-macro_rules! FOR5 {
-    ($v: expr, $s: expr, $e: expr) => {
-        $v = 0;
-        REPEAT4!({
-            $e;
-            $v += $s;
-        });
-        $e;
-    };
-}
diff --git a/k12/src/lib.rs b/k12/src/lib.rs
index 7d8d01b95..91c48950a 100644
--- a/k12/src/lib.rs
+++ b/k12/src/lib.rs
@@ -23,9 +23,6 @@ extern crate alloc;
 
 pub use digest;
 
-#[macro_use]
-mod lanes;
-
 // TODO(tarcieri): eliminate usage of `Vec`
 use alloc::vec::Vec;
 use core::{cmp::min, convert::TryInto, mem};
@@ -231,21 +228,16 @@ fn f(input: &[u8], suffix: u8, mut output_len: usize) -> Vec<u8> {
 fn keccak(state: &mut [u8; 200]) {
     let mut lanes = [0u64; 25];
 
-    let mut y;
-    for x in 0..5 {
-        FOR5!(y, 5, {
-            let pos = 8 * (x + y);
-            lanes[x + y] = u64::from_le_bytes(state[pos..(pos + 8)].try_into().unwrap());
-        });
+    for (i, lane) in lanes.iter_mut().enumerate() {
+        let pos = 8 * i;
+        *lane = u64::from_le_bytes(state[pos..(pos + 8)].try_into().unwrap());
     }
 
     keccak_p(&mut lanes, 12);
 
-    for x in 0..5 {
-        FOR5!(y, 5, {
-            let i = 8 * (x + y);
-            state[i..i + 8].copy_from_slice(&lanes[x + y].to_le_bytes());
-        });
+    for (i, lane) in lanes.iter().enumerate() {
+        let pos = 8 * i;
+        state[pos..(pos + 8)].copy_from_slice(&lane.to_le_bytes());
     }
 }