From 41c22165bbe1a0ba63be6acf706dc92da7fd1d48 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Fri, 24 Jan 2025 13:16:54 -0800 Subject: [PATCH 1/2] fixup clippy 1.84 warnings Signed-off-by: Arthur Gautier --- tss-esapi-sys/build.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tss-esapi-sys/build.rs b/tss-esapi-sys/build.rs index ff1e854f..bd4100c4 100644 --- a/tss-esapi-sys/build.rs +++ b/tss-esapi-sys/build.rs @@ -466,11 +466,11 @@ pub mod tpm2_tss { .filter(|file| { file.extension() .and_then(|ext| ext.to_str()) - .map_or(false, |file_ext| ["so", "lib"].contains(&file_ext)) + .is_some_and(|file_ext| ["so", "lib"].contains(&file_ext)) && file .file_stem() .and_then(|stem| stem.to_str()) - .map_or(false, |file_name| file_name.contains(lib_name)) + .is_some_and(|file_name| file_name.contains(lib_name)) }) .peekable(); From 444153a4a003461a8e1a462041ee20b31ccec0dd Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Fri, 24 Jan 2025 13:23:46 -0800 Subject: [PATCH 2/2] ci(valgrind): repository db may be stale Signed-off-by: Arthur Gautier --- tss-esapi/tests/valgrind.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tss-esapi/tests/valgrind.sh b/tss-esapi/tests/valgrind.sh index 8775510b..6eede9cb 100755 --- a/tss-esapi/tests/valgrind.sh +++ b/tss-esapi/tests/valgrind.sh @@ -22,6 +22,7 @@ tpm2_startup -c -T mssim ########################## # Install cargo-valgrind # ########################## +apt update apt install -y valgrind cargo install cargo-valgrind