fix to run clippy for trusted crates

Signed-off-by: Jun Kimura <junkxdev@gmail.com>

Author: bluele

Makefile

@@ -15,10 +15,12 @@ fmt-check:
 .PHONY: clippy
 clippy:
 	@find . -name Cargo.toml -not -path "./target/*" -exec dirname {} \; | while read dir; do \
-		echo "Running clippy on $$dir..."; \
-		if echo "$$dir" | grep -E -q "(enclave$$|sgx-ert)"; then \
-			echo "Skipping $$dir"; \
+		if echo "$$dir" | grep -E -q "(enclave$$|sgx-ert|sgx-trts|sgx-tcrypto|sgx-tse|sgx-tseal)"; then \
+			echo "Running clippy on $$dir with SGX target..."; \
+			TARGET_SPEC="$$(pwd)/unit-test/enclave/x86_64-unknown-unknown-sgx.json"; \
+			(cd "$$dir" && cargo clippy -Z build-std=core,alloc --target="$$TARGET_SPEC" --all-features -- -D warnings) || exit 1; \
 		else \
+			echo "Running clippy on $$dir..."; \
 			(cd "$$dir" && cargo clippy --all-targets --all-features -- -D warnings) || exit 1; \
 		fi; \
 	done

samples/hello-rust/enclave/src/lib.rs

@@ -33,7 +33,7 @@ pub extern "C" fn ecall_sample(
     };
 
     // Process the input (example: echo back with prefix)
-    let result = format!("Hello from enclave: {}", input_string);
+    let result = format!("Hello from enclave: {input_string}");
     let result_bytes = result.as_bytes();
 
     // Check if output buffer is large enough

unit-test/enclave/src/test_crate.rs

@@ -2,16 +2,16 @@ use crate::utils::*;
 use crate::TestResult;
 use alloc::string::String;
 
-static HASH_TEST_VEC: &'static [&'static str] = &[
-    &"abc",
-    &"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-    &"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
+static HASH_TEST_VEC: &[&str] = &[
+    "abc",
+    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+    "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
 ];
 
-static HASH_SHA256_TRUTH: &'static [&'static str] = &[
-    &"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
-    &"248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
-    &"cf5b16a778af8380036ce59e7b0492370b249b11e8f07a51afac45037afee9d1",
+static HASH_SHA256_TRUTH: &[&str] = &[
+    "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
+    "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
+    "cf5b16a778af8380036ce59e7b0492370b249b11e8f07a51afac45037afee9d1",
 ];
 
 pub fn test_sha2_crate() -> TestResult {

unit-test/enclave/src/test_crypto.rs

@@ -20,16 +20,16 @@ use crate::TestResult;
 use alloc::string::String;
 use sgx_tcrypto::*;
 
-static HASH_TEST_VEC: &'static [&'static str] = &[
-    &"abc",
-    &"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-    &"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
+static HASH_TEST_VEC: &[&str] = &[
+    "abc",
+    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+    "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
 ];
 
-static HASH_SHA256_TRUTH: &'static [&'static str] = &[
-    &"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
-    &"248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
-    &"cf5b16a778af8380036ce59e7b0492370b249b11e8f07a51afac45037afee9d1",
+static HASH_SHA256_TRUTH: &[&str] = &[
+    "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
+    "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
+    "cf5b16a778af8380036ce59e7b0492370b249b11e8f07a51afac45037afee9d1",
 ];
 
 pub fn test_rsgx_sha256_slice() -> TestResult {

unit-test/enclave/src/test_seal.rs

@@ -52,8 +52,7 @@ pub fn test_seal_unseal() -> TestResult {
 
     unsafe impl ContiguousMemory for RandData {}
 
-    let mut data = RandData::default();
-    data.key = 0x1234;
+    let mut data = RandData { key: 0x1234, ..Default::default() };
 
     // Use sgx random instead of StdRng
     rsgx_read_rand(&mut data.rand).map_err(|_| "Failed to generate random data")?;
@@ -105,7 +104,7 @@ pub fn test_mac_aadata_slice() -> TestResult {
     if unsealed_data.get_decrypt_txt() != &text {
         return Err("Decrypted text verification failed");
     }
-    if unsealed_data.get_additional_txt() != &aad_data {
+    if unsealed_data.get_additional_txt() != aad_data {
         return Err("AAD verification failed");
     }