From 1ce30e1cead53d656b2d4e5c7193cffb4dfab830 Mon Sep 17 00:00:00 2001
From: 0xalivecow <mail@ta-lotz.de>
Date: Sat, 2 Nov 2024 14:19:21 +0100
Subject: [PATCH] refactor: Apply cargo reccomended cleanups

---
 src/main.rs                     | 2 +-
 src/tasks/mod.rs                | 2 +-
 src/tasks/tasks01/block2poly.rs | 4 ++--
 src/tasks/tasks01/gfmul.rs      | 7 ++-----
 src/tasks/tasks01/poly2block.rs | 3 +--
 src/tasks/tasks01/sea128.rs     | 2 +-
 src/utils/ciphers.rs            | 1 -
 src/utils/field.rs              | 2 +-
 src/utils/math.rs               | 4 +---
 src/utils/parse.rs              | 2 +-
 src/utils/poly.rs               | 4 +---
 11 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 5816ecb..201533c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
 use std::{
-    env::{self, args},
+    env::{self},
     fs,
 };
 
diff --git a/src/tasks/mod.rs b/src/tasks/mod.rs
index 168747e..f0adb70 100644
--- a/src/tasks/mod.rs
+++ b/src/tasks/mod.rs
@@ -8,7 +8,7 @@ use tasks01::{
     gfmul::gfmul_task,
     poly2block::poly2block,
     sea128::sea128,
-    xex::{self, fde_xex},
+    xex::{fde_xex},
 };
 
 use anyhow::{anyhow, Result};
diff --git a/src/tasks/tasks01/block2poly.rs b/src/tasks/tasks01/block2poly.rs
index b6a215d..66cccc5 100644
--- a/src/tasks/tasks01/block2poly.rs
+++ b/src/tasks/tasks01/block2poly.rs
@@ -1,4 +1,4 @@
-use crate::utils::poly::{b64_2_num, block_2_polynomial, get_coefficients};
+use crate::utils::poly::block_2_polynomial;
 use anyhow::Result;
 use base64::prelude::*;
 use serde_json::Value;
@@ -19,7 +19,7 @@ pub fn block2poly(val: &Value) -> Result<Vec<u8>> {
 #[cfg(test)]
 mod tests {
     use serde_json::json;
-    use std::str::FromStr;
+    
 
     // Note this useful idiom: importing names from outer (for mod tests) scope.
     use super::*;
diff --git a/src/tasks/tasks01/gfmul.rs b/src/tasks/tasks01/gfmul.rs
index c4acefe..b398b6e 100644
--- a/src/tasks/tasks01/gfmul.rs
+++ b/src/tasks/tasks01/gfmul.rs
@@ -1,7 +1,4 @@
-use crate::utils::{
-    field::ByteArray,
-    poly::{b64_2_num, coefficient_to_binary, gfmul},
-};
+use crate::utils::poly::gfmul;
 
 use anyhow::Result;
 use base64::prelude::*;
@@ -24,7 +21,7 @@ pub fn gfmul_task(args: &Value) -> Result<Vec<u8>> {
 #[cfg(test)]
 mod tests {
     use serde_json::json;
-    use std::str::FromStr;
+    
 
     // Note this useful idiom: importing names from outer (for mod tests) scope.
     use super::*;
diff --git a/src/tasks/tasks01/poly2block.rs b/src/tasks/tasks01/poly2block.rs
index 293d1c3..6d5ad95 100644
--- a/src/tasks/tasks01/poly2block.rs
+++ b/src/tasks/tasks01/poly2block.rs
@@ -1,6 +1,5 @@
-use crate::utils::poly::{self, polynomial_2_block};
+use crate::utils::poly::{polynomial_2_block};
 use anyhow::{Ok, Result};
-use base64::prelude::*;
 use serde_json::Value;
 
 pub fn poly2block(args: &Value) -> Result<Vec<u8>> {
diff --git a/src/tasks/tasks01/sea128.rs b/src/tasks/tasks01/sea128.rs
index 3f5c40d..09170dc 100644
--- a/src/tasks/tasks01/sea128.rs
+++ b/src/tasks/tasks01/sea128.rs
@@ -34,7 +34,7 @@ pub fn sea128(args: &Value) -> Result<String> {
 
 #[cfg(test)]
 mod tests {
-    use std::fs;
+    
 
     use anyhow::Result;
     use serde_json::json;
diff --git a/src/utils/ciphers.rs b/src/utils/ciphers.rs
index 885b1c3..62413a8 100644
--- a/src/utils/ciphers.rs
+++ b/src/utils/ciphers.rs
@@ -1,4 +1,3 @@
-use std::io::BufRead;
 
 use anyhow::Result;
 use openssl::symm::{Cipher, Crypter, Mode};
diff --git a/src/utils/field.rs b/src/utils/field.rs
index afa9b06..f2c80b4 100644
--- a/src/utils/field.rs
+++ b/src/utils/field.rs
@@ -101,7 +101,7 @@ impl ByteArray {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::fs;
+    
 
     #[test]
     fn test_byte_array_shift1() {
diff --git a/src/utils/math.rs b/src/utils/math.rs
index 4021522..fa82819 100644
--- a/src/utils/math.rs
+++ b/src/utils/math.rs
@@ -1,7 +1,5 @@
-use anyhow::{anyhow, Ok, Result};
-use base64::Engine;
+use anyhow::{Ok, Result};
 
-use super::poly::gfmul;
 
 pub fn xor_bytes(vec1: &Vec<u8>, mut vec2: Vec<u8>) -> Result<Vec<u8>> {
     for (byte1, byte2) in vec1.iter().zip(vec2.iter_mut()) {
diff --git a/src/utils/parse.rs b/src/utils/parse.rs
index 5cc1781..e9a9fb8 100644
--- a/src/utils/parse.rs
+++ b/src/utils/parse.rs
@@ -28,7 +28,7 @@ pub fn parse_json(json: String) -> Result<Testcases> {
 mod tests {
     use std::fs;
 
-    use serde_json::json;
+    
 
     // Note this useful idiom: importing names from outer (for mod tests) scope.
     use super::*;
diff --git a/src/utils/poly.rs b/src/utils/poly.rs
index 50e7ce6..4b984ea 100644
--- a/src/utils/poly.rs
+++ b/src/utils/poly.rs
@@ -1,10 +1,8 @@
 use crate::utils::field::ByteArray;
 use anyhow::{anyhow, Result};
 use base64::prelude::*;
-use serde_json::Value;
 use std::{str::FromStr, u128, u8, usize};
 
-use super::field;
 pub const RED_POLY: u128 = 0x87000000_00000000_00000000_00000000;
 
 pub fn gfmul(poly_a: Vec<u8>, poly_b: Vec<u8>, semantic: &str) -> Result<Vec<u8>> {
@@ -167,7 +165,7 @@ pub fn coefficients_to_byte_arr_xex(coeffs: Vec<u8>) -> Vec<u8> {
     let mut byte_array: Vec<u8> = vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
     for coeff in coeffs {
         let block_num = coeff / 8;
-        byte_array[usize::from(block_num)] |= (1 << (coeff % 7));
+        byte_array[usize::from(block_num)] |= 1 << (coeff % 7);
     }
 
     byte_array