Apply latest cargo clippy recommendations

onethumb · onethumb · commit 01df5f5edfe7 · 2025-07-16T15:27:04.000-07:00
diff --git a/src/bin/arch-check.rs b/src/bin/arch-check.rs
@@ -29,19 +29,19 @@ fn aarch64_features() {
     println!("[AArch64] Checking for features...");
 
     if is_aarch64_feature_detected!("neon") {
-        println!("  {} NEON", checkmark);
+        println!("  {checkmark} NEON",);
     } else {
         println!("  x NEON");
     }
 
     if is_aarch64_feature_detected!("crc") {
-        println!("  {} CRC", checkmark);
+        println!("  {checkmark} CRC",);
     } else {
         println!("  x CRC");
     }
 
     if is_aarch64_feature_detected!("sha3") {
-        println!("  {} SHA3\n", checkmark);
+        println!("  {checkmark} SHA3\n",);
     } else {
         println!("  x SHA3\n");
     }
@@ -54,43 +54,43 @@ fn x86_features() {
     println!("[X86] Checking for features...");
 
     if is_x86_feature_detected!("sse2") {
-        println!("  {} SSE2", checkmark);
+        println!("  {checkmark} SSE2",);
     } else {
         println!("  x SSE2");
     }
 
     if is_x86_feature_detected!("sse4.1") {
-        println!("  {} SSE4.1", checkmark);
+        println!("  {checkmark} SSE4.1",);
     } else {
         println!("  x SSE4.1");
     }
 
     if is_x86_feature_detected!("pclmulqdq") {
-        println!("  {} PCLMULQDQ", checkmark);
+        println!("  {checkmark} PCLMULQDQ",);
     } else {
         println!("  x PCLMULQDQ");
     }
 
     if is_x86_feature_detected!("avx2") {
-        println!("  {} AVX2", checkmark);
+        println!("  {checkmark} AVX2",);
     } else {
         println!("  x AVX2");
     }
 
     if is_x86_feature_detected!("vpclmulqdq") {
-        println!("  {} VPCLMULQDQ", checkmark);
+        println!("  {checkmark} VPCLMULQDQ",);
     } else {
         println!("  x VPCLMULQDQ");
     }
 
     if is_x86_feature_detected!("avx512f") {
-        println!("  {} AVX512F", checkmark);
+        println!("  {checkmark} AVX512F",);
     } else {
         println!("  x AVX512F");
     }
 
     if is_x86_feature_detected!("avx512vl") {
-        println!("  {} AVX512VL\n", checkmark);
+        println!("  {checkmark} AVX512VL\n",);
     } else {
         println!("  x AVX512VL\n");
     }
@@ -125,7 +125,7 @@ fn print_cpu_info() {
     if let Ok(cpuinfo) = std::fs::read_to_string("/proc/cpuinfo") {
         // Split the content by double newlines and take the first entry
         if let Some(first_cpu) = cpuinfo.split("\n\n").next() {
-            println!("{}", first_cpu);
+            println!("{first_cpu}",);
         } else {
             println!("No CPU information found.");
         }
diff --git a/src/bin/get-custom-params.rs b/src/bin/get-custom-params.rs
@@ -40,18 +40,18 @@ impl Config {
 
 fn parse_hex_or_decimal(s: &str) -> Result<u64, String> {
     if s.starts_with("0x") || s.starts_with("0X") {
-        u64::from_str_radix(&s[2..], 16).map_err(|_| format!("Invalid hexadecimal value: {}", s))
+        u64::from_str_radix(&s[2..], 16).map_err(|_| format!("Invalid hexadecimal value: {s}",))
     } else {
         s.parse::<u64>()
-            .map_err(|_| format!("Invalid decimal value: {}", s))
+            .map_err(|_| format!("Invalid decimal value: {s}",))
     }
 }
 
 fn parse_bool(s: &str) -> Result<bool, String> {
     match s.to_lowercase().as_str() {
         "true" | "1" | "yes" | "on" => Ok(true),
         "false" | "0" | "no" | "off" => Ok(false),
-        _ => Err(format!("Invalid boolean value: {} (use true/false)", s)),
+        _ => Err(format!("Invalid boolean value: {s} (use true/false)",)),
     }
 }
 
@@ -115,7 +115,7 @@ fn parse_args(args: &[String]) -> Result<Config, String> {
                 i += 2;
             }
             arg => {
-                return Err(format!("Unknown argument: {}", arg));
+                return Err(format!("Unknown argument: {arg}",));
             }
         }
     }
@@ -150,7 +150,7 @@ fn main() -> ExitCode {
     let config = match parse_args(&args) {
         Ok(config) => config,
         Err(error) => {
-            eprintln!("Error: {}", error);
+            eprintln!("Error: {error}",);
             println!();
             print_usage();
             return ExitCode::from(1);
@@ -178,7 +178,7 @@ fn main() -> ExitCode {
     );
 
     println!();
-    println!("// Generated CRC parameters for {}", static_name);
+    println!("// Generated CRC parameters for {static_name}",);
     println!(
         "pub const {}: CrcParams = CrcParams {{",
         static_name
@@ -194,7 +194,7 @@ fn main() -> ExitCode {
             "Crc64"
         }
     );
-    println!("    name: \"{}\",", static_name);
+    println!("    name: \"{static_name}\",",);
     println!("    width: {},", config.width.unwrap());
     println!("    poly: 0x{:x},", config.polynomial.unwrap());
     println!("    init: 0x{:x},", config.init.unwrap());
@@ -207,7 +207,7 @@ fn main() -> ExitCode {
     // Print the keys array
     for i in 0..23 {
         let key = params.get_key(i);
-        println!("        0x{:016x},", key);
+        println!("        0x{key:016x},",);
     }
 
     println!("    ]),");
diff --git a/src/enums.rs b/src/enums.rs
@@ -37,27 +37,27 @@ impl FromStr for CrcAlgorithm {
 impl Display for CrcAlgorithm {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            CrcAlgorithm::Crc32Aixm => write!(f, "{}", NAME_CRC32_AIXM),
-            CrcAlgorithm::Crc32Autosar => write!(f, "{}", NAME_CRC32_AUTOSAR),
-            CrcAlgorithm::Crc32Base91D => write!(f, "{}", NAME_CRC32_BASE91_D),
-            CrcAlgorithm::Crc32Bzip2 => write!(f, "{}", NAME_CRC32_BZIP2),
-            CrcAlgorithm::Crc32CdRomEdc => write!(f, "{}", NAME_CRC32_CD_ROM_EDC),
-            CrcAlgorithm::Crc32Cksum => write!(f, "{}", NAME_CRC32_CKSUM),
+            CrcAlgorithm::Crc32Aixm => write!(f, "{NAME_CRC32_AIXM}",),
+            CrcAlgorithm::Crc32Autosar => write!(f, "{NAME_CRC32_AUTOSAR}",),
+            CrcAlgorithm::Crc32Base91D => write!(f, "{NAME_CRC32_BASE91_D}",),
+            CrcAlgorithm::Crc32Bzip2 => write!(f, "{NAME_CRC32_BZIP2}",),
+            CrcAlgorithm::Crc32CdRomEdc => write!(f, "{NAME_CRC32_CD_ROM_EDC}",),
+            CrcAlgorithm::Crc32Cksum => write!(f, "{NAME_CRC32_CKSUM}",),
             CrcAlgorithm::Crc32Custom => write!(f, "CRC-32/CUSTOM"),
-            CrcAlgorithm::Crc32Iscsi => write!(f, "{}", NAME_CRC32_ISCSI),
-            CrcAlgorithm::Crc32IsoHdlc => write!(f, "{}", NAME_CRC32_ISO_HDLC),
-            CrcAlgorithm::Crc32Jamcrc => write!(f, "{}", NAME_CRC32_JAMCRC),
-            CrcAlgorithm::Crc32Mef => write!(f, "{}", NAME_CRC32_MEF),
-            CrcAlgorithm::Crc32Mpeg2 => write!(f, "{}", NAME_CRC32_MPEG_2),
-            CrcAlgorithm::Crc32Xfer => write!(f, "{}", NAME_CRC32_XFER),
+            CrcAlgorithm::Crc32Iscsi => write!(f, "{NAME_CRC32_ISCSI}",),
+            CrcAlgorithm::Crc32IsoHdlc => write!(f, "{NAME_CRC32_ISO_HDLC}",),
+            CrcAlgorithm::Crc32Jamcrc => write!(f, "{NAME_CRC32_JAMCRC}",),
+            CrcAlgorithm::Crc32Mef => write!(f, "{NAME_CRC32_MEF}",),
+            CrcAlgorithm::Crc32Mpeg2 => write!(f, "{NAME_CRC32_MPEG_2}",),
+            CrcAlgorithm::Crc32Xfer => write!(f, "{NAME_CRC32_XFER}",),
             CrcAlgorithm::Crc64Custom => write!(f, "CRC-64/CUSTOM"),
-            CrcAlgorithm::Crc64GoIso => write!(f, "{}", NAME_CRC64_GO_ISO),
-            CrcAlgorithm::Crc64Ms => write!(f, "{}", NAME_CRC64_MS),
-            CrcAlgorithm::Crc64Nvme => write!(f, "{}", NAME_CRC64_NVME),
-            CrcAlgorithm::Crc64Redis => write!(f, "{}", NAME_CRC64_REDIS),
-            CrcAlgorithm::Crc64Xz => write!(f, "{}", NAME_CRC64_XZ),
-            CrcAlgorithm::Crc64Ecma182 => write!(f, "{}", NAME_CRC64_ECMA_182),
-            CrcAlgorithm::Crc64We => write!(f, "{}", NAME_CRC64_WE),
+            CrcAlgorithm::Crc64GoIso => write!(f, "{NAME_CRC64_GO_ISO}",),
+            CrcAlgorithm::Crc64Ms => write!(f, "{NAME_CRC64_MS}",),
+            CrcAlgorithm::Crc64Nvme => write!(f, "{NAME_CRC64_NVME}",),
+            CrcAlgorithm::Crc64Redis => write!(f, "{NAME_CRC64_REDIS}",),
+            CrcAlgorithm::Crc64Xz => write!(f, "{NAME_CRC64_XZ}",),
+            CrcAlgorithm::Crc64Ecma182 => write!(f, "{NAME_CRC64_ECMA_182}",),
+            CrcAlgorithm::Crc64We => write!(f, "{NAME_CRC64_WE}",),
         }
     }
 }
diff --git a/src/ffi.rs b/src/ffi.rs
@@ -468,7 +468,7 @@ pub extern "C" fn crc_fast_get_custom_params(
         algorithm: match width {
             32 => CrcFastAlgorithm::Crc32Custom,
             64 => CrcFastAlgorithm::Crc64Custom,
-            _ => panic!("Unsupported width: {}", width),
+            _ => panic!("Unsupported width: {width}",),
         },
         width: params.width,
         poly: params.poly,
diff --git a/src/generate.rs b/src/generate.rs
@@ -68,7 +68,7 @@ pub fn keys(width: u8, poly: u64, reflected: bool) -> [u64; 23] {
     } else if 64 == width {
         CRC64_EXPONENTS
     } else {
-        panic!("Unsupported width: {}", width);
+        panic!("Unsupported width: {width}",);
     };
 
     let poly = if 32 == width {
@@ -93,7 +93,7 @@ fn key(width: u8, poly: u64, reflected: bool, exponent: u64) -> u64 {
     } else if width == 64 {
         crc64_key(exponent, reflected, poly)
     } else {
-        panic!("Unsupported width: {}", width);
+        panic!("Unsupported width: {width}",);
     }
 }
 
@@ -148,7 +148,7 @@ fn polynomial(width: u8, polynomial: u64, reflected: bool) -> u64 {
     } else if width == 64 {
         crc64_polynomial(polynomial, reflected)
     } else {
-        panic!("Unsupported width: {}", width);
+        panic!("Unsupported width: {width}",);
     }
 }
 
@@ -178,7 +178,7 @@ fn mu(width: u8, polynomial: u64, reflected: bool) -> u64 {
     } else if width == 64 {
         crc64_mu(polynomial, reflected)
     } else {
-        panic!("Unsupported width: {}", width);
+        panic!("Unsupported width: {width}",);
     }
 }
 
diff --git a/src/structs.rs b/src/structs.rs
@@ -64,7 +64,7 @@ impl CrcParams {
         let algorithm = match width {
             32 => CrcAlgorithm::Crc32Custom,
             64 => CrcAlgorithm::Crc64Custom,
-            _ => panic!("Unsupported width: {}", width),
+            _ => panic!("Unsupported width: {width}",),
         };
 
         Self {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ pub fn keys(width: u8, poly: u64, reflected: bool) -> [u64; 23] {`
`68`	`68`	`} else if 64 == width {`
`69`	`69`	`CRC64_EXPONENTS`
`70`	`70`	`} else {`
`71`		`- panic!("Unsupported width: {}", width);`
	`71`	`+ panic!("Unsupported width: {width}",);`
`72`	`72`	`};`
`73`	`73`
`74`	`74`	`let poly = if 32 == width {`
`@@ -93,7 +93,7 @@ fn key(width: u8, poly: u64, reflected: bool, exponent: u64) -> u64 {`
`93`	`93`	`} else if width == 64 {`
`94`	`94`	`crc64_key(exponent, reflected, poly)`
`95`	`95`	`} else {`
`96`		`- panic!("Unsupported width: {}", width);`
	`96`	`+ panic!("Unsupported width: {width}",);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`@@ -148,7 +148,7 @@ fn polynomial(width: u8, polynomial: u64, reflected: bool) -> u64 {`
`148`	`148`	`} else if width == 64 {`
`149`	`149`	`crc64_polynomial(polynomial, reflected)`
`150`	`150`	`} else {`
`151`		`- panic!("Unsupported width: {}", width);`
	`151`	`+ panic!("Unsupported width: {width}",);`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`@@ -178,7 +178,7 @@ fn mu(width: u8, polynomial: u64, reflected: bool) -> u64 {`
`178`	`178`	`} else if width == 64 {`
`179`	`179`	`crc64_mu(polynomial, reflected)`
`180`	`180`	`} else {`
`181`		`- panic!("Unsupported width: {}", width);`
	`181`	`+ panic!("Unsupported width: {width}",);`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`