Address clippy

justsmth · justsmth · commit f6e3f654c3b7 · 2025-10-08T10:50:47.000-04:00
diff --git a/aws-lc-sys/builder/cc_builder.rs b/aws-lc-sys/builder/cc_builder.rs
@@ -58,17 +58,15 @@ fn identify_sources() -> Vec<&'static str> {
         } else if target_arch() == "aarch64" || target_arch() == "arm64" {
             source_files.append(&mut Vec::from(apple_aarch64::CRYPTO_LIBRARY));
         }
-    } else {
-        if target_arch() == "x86_64" {
-            source_files.append(&mut Vec::from(linux_x86_64::CRYPTO_LIBRARY));
-        } else if target_arch() == "aarch64" || target_arch() == "arm64" {
-            source_files.append(&mut Vec::from(linux_aarch64::CRYPTO_LIBRARY));
-        } else if target_arch().ends_with("86") && target_arch().starts_with("i") {
-            source_files.append(&mut Vec::from(linux_i686::CRYPTO_LIBRARY));
-        } else if target_arch() == "powerpc64le" {
-            source_files.append(&mut Vec::from(linux_ppc64le::CRYPTO_LIBRARY));
-        }
-    };
+    } else if target_arch() == "x86_64" {
+        source_files.append(&mut Vec::from(linux_x86_64::CRYPTO_LIBRARY));
+    } else if target_arch() == "aarch64" || target_arch() == "arm64" {
+        source_files.append(&mut Vec::from(linux_aarch64::CRYPTO_LIBRARY));
+    } else if target_arch().ends_with("86") && target_arch().starts_with('i') {
+        source_files.append(&mut Vec::from(linux_i686::CRYPTO_LIBRARY));
+    } else if target_arch() == "powerpc64le" {
+        source_files.append(&mut Vec::from(linux_ppc64le::CRYPTO_LIBRARY));
+    }
     source_files
 }
 
@@ -144,7 +142,7 @@ impl BuildOption {
             BuildOption::FLAG(val) => nasm_builder.flag(val),
             BuildOption::DEFINE(key, val) => nasm_builder.define(key, Some(val.as_str())),
             BuildOption::INCLUDE(path) => nasm_builder.include(path.as_path()),
-            _ => nasm_builder, // STD ignored for NASM
+            BuildOption::STD(_) => nasm_builder, // STD ignored for NASM
         }
     }
 }
@@ -348,6 +346,7 @@ impl CcBuilder {
         source_feature_map
     }
 
+    #[allow(clippy::unused_self)]
     fn add_defines(&self, build_options: &mut Vec<BuildOption>, is_like_msvc: bool) {
         if is_like_msvc {
             build_options.push(BuildOption::define("_HAS_EXCEPTIONS", "0"));
diff --git a/aws-lc-sys/builder/cc_builder/apple_aarch64.rs b/aws-lc-sys/builder/cc_builder/apple_aarch64.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 // Tue Sep 30 15:54:00 UTC 2025
 
-pub(super) const CRYPTO_LIBRARY: &'static [&'static str] = &[
+pub(super) const CRYPTO_LIBRARY: &[&str] = &[
     "crypto/fipsmodule/ml_kem/mlkem/native/aarch64/src/intt.S",
     "crypto/fipsmodule/ml_kem/mlkem/native/aarch64/src/ntt.S",
     "crypto/fipsmodule/ml_kem/mlkem/native/aarch64/src/poly_mulcache_compute_asm.S",
diff --git a/aws-lc-sys/builder/cc_builder/apple_x86_64.rs b/aws-lc-sys/builder/cc_builder/apple_x86_64.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 // Tue Sep 30 15:55:28 UTC 2025
 
-pub(super) const CRYPTO_LIBRARY: &'static [&'static str] = &[
+pub(super) const CRYPTO_LIBRARY: &[&str] = &[
     "crypto/fipsmodule/ml_kem/mlkem/native/x86_64/src/intt.S",
     "crypto/fipsmodule/ml_kem/mlkem/native/x86_64/src/mulcache_compute.S",
     "crypto/fipsmodule/ml_kem/mlkem/native/x86_64/src/ntt.S",
diff --git a/aws-lc-sys/builder/cc_builder/linux_aarch64.rs b/aws-lc-sys/builder/cc_builder/linux_aarch64.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 // Tue Sep 30 15:58:17 UTC 2025
 
-pub(super) const CRYPTO_LIBRARY: &'static [&'static str] = &[
+pub(super) const CRYPTO_LIBRARY: &[&str] = &[
     "crypto/fipsmodule/ml_kem/mlkem/native/aarch64/src/intt.S",
     "crypto/fipsmodule/ml_kem/mlkem/native/aarch64/src/ntt.S",
     "crypto/fipsmodule/ml_kem/mlkem/native/aarch64/src/poly_mulcache_compute_asm.S",
diff --git a/aws-lc-sys/builder/cc_builder/linux_i686.rs b/aws-lc-sys/builder/cc_builder/linux_i686.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 // Tue Sep 30 15:58:42 UTC 2025
 
-pub(super) const CRYPTO_LIBRARY: &'static [&'static str] = &[
+pub(super) const CRYPTO_LIBRARY: &[&str] = &[
     "generated-src/linux-x86/crypto/chacha/chacha-x86.S",
     "generated-src/linux-x86/crypto/fipsmodule/aesni-x86.S",
     "generated-src/linux-x86/crypto/fipsmodule/bn-586.S",
diff --git a/aws-lc-sys/builder/cc_builder/linux_ppc64le.rs b/aws-lc-sys/builder/cc_builder/linux_ppc64le.rs
@@ -1,4 +1,4 @@
-pub(super) const CRYPTO_LIBRARY: &'static [&'static str] = &[
+pub(super) const CRYPTO_LIBRARY: &[&str] = &[
     "generated-src/linux-ppc64le/crypto/fipsmodule/aesp8-ppc.S",
     "generated-src/linux-ppc64le/crypto/fipsmodule/ghashp8-ppc.S",
     "generated-src/linux-ppc64le/crypto/test/trampoline-ppc.S",
diff --git a/aws-lc-sys/builder/cc_builder/linux_x86_64.rs b/aws-lc-sys/builder/cc_builder/linux_x86_64.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 // Tue Sep 30 15:53:39 UTC 2025
 
-pub(super) const CRYPTO_LIBRARY: &'static [&'static str] = &[
+pub(super) const CRYPTO_LIBRARY: &[&str] = &[
     "crypto/fipsmodule/ml_kem/mlkem/native/x86_64/src/intt.S",
     "crypto/fipsmodule/ml_kem/mlkem/native/x86_64/src/mulcache_compute.S",
     "crypto/fipsmodule/ml_kem/mlkem/native/x86_64/src/ntt.S",
diff --git a/aws-lc-sys/builder/cc_builder/universal.rs b/aws-lc-sys/builder/cc_builder/universal.rs
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 
-pub(super) const CRYPTO_LIBRARY: &'static [&'static str] = &[
+pub(super) const CRYPTO_LIBRARY: &[&str] = &[
     "crypto/asn1/a_bitstr.c",
     "crypto/asn1/a_bool.c",
     "crypto/asn1/a_d2i_fp.c",
diff --git a/aws-lc-sys/builder/cc_builder/win_aarch64.rs b/aws-lc-sys/builder/cc_builder/win_aarch64.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 // Tue Sep 30 15:55:28 UTC 2025
 
-pub(super) const CRYPTO_LIBRARY: &'static [&'static str] = &[
+pub(super) const CRYPTO_LIBRARY: &[&str] = &[
     "generated-src/win-aarch64/crypto/chacha/chacha-armv8.S",
     "generated-src/win-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8.S",
     "generated-src/win-aarch64/crypto/fipsmodule/aesv8-armx.S",
diff --git a/aws-lc-sys/builder/cc_builder/win_x86_64.rs b/aws-lc-sys/builder/cc_builder/win_x86_64.rs
@@ -1,4 +1,4 @@
-pub(super) const CRYPTO_LIBRARY: &'static [&'static str] = &[
+pub(super) const CRYPTO_LIBRARY: &[&str] = &[
     "generated-src/win-x86_64/crypto/chacha/chacha-x86_64.asm",
     "generated-src/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm",
     "generated-src/win-x86_64/crypto/cipher_extra/aesni-sha1-x86_64.asm",
diff --git a/aws-lc-sys/builder/nasm_builder.rs b/aws-lc-sys/builder/nasm_builder.rs
@@ -41,7 +41,7 @@ impl NasmBuilder {
 
     pub(crate) fn define(&mut self, key: &str, val: Option<&str>) -> &mut Self {
         self.defines
-            .push((key.to_string(), val.map(|s| s.to_string())));
+            .push((key.to_string(), val.map(std::string::ToString::to_string)));
         self
     }
 
@@ -57,31 +57,7 @@ impl NasmBuilder {
             return vec![];
         }
 
-        if !test_nasm_command() {
-            if use_prebuilt_nasm() {
-                let prebuilt_dir = self.manifest_dir.join("builder").join("prebuilt-nasm");
-                for src in &self.files {
-                    let obj_name = src
-                        .file_name()
-                        .unwrap()
-                        .to_str()
-                        .unwrap()
-                        .replace(".asm", ".obj");
-                    let obj_path = self.out_dir.join(&obj_name);
-                    let base_name = obj_name.strip_suffix(".obj").unwrap_or(&obj_name);
-                    let prebuilt_src = prebuilt_dir.join(format!("{}.obj", base_name));
-                    if prebuilt_src.exists() {
-                        fs::copy(&prebuilt_src, &obj_path)
-                            .expect("Failed to copy prebuilt NASM object");
-                    } else {
-                        panic!("Prebuilt NASM object not found: {}", prebuilt_src.display());
-                    }
-                    objects.push(obj_path);
-                }
-            } else {
-                panic!("NASM command not found! Build cannot continue.");
-            }
-        } else {
+        if test_nasm_command() {
             for src in &self.files {
                 let obj_name = src
                     .file_name()
@@ -105,32 +81,56 @@ impl NasmBuilder {
 
                 for (key, val) in &self.defines {
                     let def = if let Some(v) = val {
-                        format!("-D{}={}", key, v)
+                        format!("-D{key}={v}")
                     } else {
-                        format!("-D{}", key)
+                        format!("-D{key}")
                     };
                     args.push(def.into());
                 }
 
-                args.extend(self.flags.iter().map(|s| s.into()));
+                args.extend(self.flags.iter().map(std::convert::Into::into));
 
                 args.push(src.as_os_str().into());
 
                 let result = execute_command(
                     "nasm".as_ref(),
-                    &args.iter().map(|s| s.as_os_str()).collect::<Vec<_>>(),
+                    &args
+                        .iter()
+                        .map(std::ffi::OsString::as_os_str)
+                        .collect::<Vec<_>>(),
+                );
+                assert!(
+                    result.status,
+                    "NASM failed for {}:\n-----\n{}\n-----\n{}\n-----\n",
+                    src.display(),
+                    result.stdout,
+                    result.stderr
                 );
-                if !result.status {
-                    panic!(
-                        "NASM failed for {}:\n-----\n{}\n-----\n{}\n-----\n",
-                        src.display(),
-                        result.stdout,
-                        result.stderr
-                    );
-                }
 
                 objects.push(obj_path);
             }
+        } else if use_prebuilt_nasm() {
+            let prebuilt_dir = self.manifest_dir.join("builder").join("prebuilt-nasm");
+            for src in &self.files {
+                let obj_name = src
+                    .file_name()
+                    .unwrap()
+                    .to_str()
+                    .unwrap()
+                    .replace(".asm", ".obj");
+                let obj_path = self.out_dir.join(&obj_name);
+                let base_name = obj_name.strip_suffix(".obj").unwrap_or(&obj_name);
+                let prebuilt_src = prebuilt_dir.join(format!("{base_name}.obj"));
+                if prebuilt_src.exists() {
+                    fs::copy(&prebuilt_src, &obj_path)
+                        .expect("Failed to copy prebuilt NASM object");
+                } else {
+                    panic!("Prebuilt NASM object not found: {}", prebuilt_src.display());
+                }
+                objects.push(obj_path);
+            }
+        } else {
+            panic!("NASM command not found! Build cannot continue.");
         }
 
         objects

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-pub(super) const CRYPTO_LIBRARY: &'static [&'static str] = &[`
	`1`	`+pub(super) const CRYPTO_LIBRARY: &[&str] = &[`
`2`	`2`	`"generated-src/linux-ppc64le/crypto/fipsmodule/aesp8-ppc.S",`
`3`	`3`	`"generated-src/linux-ppc64le/crypto/fipsmodule/ghashp8-ppc.S",`
`4`	`4`	`"generated-src/linux-ppc64le/crypto/test/trampoline-ppc.S",`