From 81b32562798ffc4269802fa6132d8478e5039756 Mon Sep 17 00:00:00 2001 From: Kevin Lewi Date: Wed, 5 Aug 2026 16:08:00 -0700 Subject: [PATCH] Fix clippy lints introduced by Rust 1.97 Rust 1.97 promoted two lints that now fire under CI's `cargo clippy --all -- -D clippy::all -D warnings`, breaking main: - `clippy::for_kv_map` in akd/src/storage/transaction.rs: iterate with `values_mut()` instead of destructuring an unused key. - `clippy::question_mark` in examples/src/mysql_demo/mysql_storables.rs: replace a match-on-Result with `?`, matching the idiom already used a few lines above. Both changes are semantics-preserving. --- akd/src/storage/transaction.rs | 2 +- examples/src/mysql_demo/mysql_storables.rs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/akd/src/storage/transaction.rs b/akd/src/storage/transaction.rs index baf568d0..7fe07a0c 100644 --- a/akd/src/storage/transaction.rs +++ b/akd/src/storage/transaction.rs @@ -202,7 +202,7 @@ impl Transaction { } // sort all the value lists by epoch - for (_k, v) in results.iter_mut() { + for v in results.values_mut() { v.sort_unstable_by_key(|a| a.epoch); } diff --git a/examples/src/mysql_demo/mysql_storables.rs b/examples/src/mysql_demo/mysql_storables.rs index 8feccbfb..eab61ea1 100644 --- a/examples/src/mysql_demo/mysql_storables.rs +++ b/examples/src/mysql_demo/mysql_storables.rs @@ -711,10 +711,7 @@ impl MySqlStorable for DbRecord { let massaged_hash_vec: akd::Digest = akd::hash::try_parse_digest(&hash_vec).map_err(|_| cast_err())?; let massaged_prev_hash_vec: Option = match prev_hash_vec { - Some(v) => match akd::hash::try_parse_digest(&v).map_err(|_| cast_err()) { - Ok(r) => Some(r), - Err(err) => return Err(err), - }, + Some(v) => Some(akd::hash::try_parse_digest(&v).map_err(|_| cast_err())?), None => None, };