From d3a88bc332b3fd09cebea3cdc9df5c8050e188b3 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Thu, 16 Feb 2023 16:10:13 +0000
Subject: [PATCH] Fix 1.67.1 clippy lints

---
 src/rust/src/history_ffi.rs             |  2 +-
 src/rust/src/incremental_merkle_tree.rs |  8 ++++----
 src/rust/src/metrics_ffi.rs             | 22 ++++++++--------------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/rust/src/history_ffi.rs b/src/rust/src/history_ffi.rs
index f132de9d3..4271d708e 100644
--- a/src/rust/src/history_ffi.rs
+++ b/src/rust/src/history_ffi.rs
@@ -145,7 +145,7 @@ fn librustzcash_mmr_append_inner<V: Version>(
     unsafe {
         *rt_ret = V::hash(root_node.data());
 
-        for (idx, next_buf) in slice::from_raw_parts_mut(buf_ret, return_count as usize)
+        for (idx, next_buf) in slice::from_raw_parts_mut(buf_ret, return_count)
             .iter_mut()
             .enumerate()
         {
diff --git a/src/rust/src/incremental_merkle_tree.rs b/src/rust/src/incremental_merkle_tree.rs
index 0f51b9635..c7b228fd0 100644
--- a/src/rust/src/incremental_merkle_tree.rs
+++ b/src/rust/src/incremental_merkle_tree.rs
@@ -76,11 +76,11 @@ pub fn write_tree<H: Hashable + HashSer + Ord, W: Write>(
     tree: &BridgeTree<H, 32>,
 ) -> io::Result<()> {
     writer.write_u8(SER_V2)?;
-    Vector::write(&mut writer, tree.prior_bridges(), |mut w, b| {
-        write_bridge_v1(&mut w, b)
+    Vector::write(&mut writer, tree.prior_bridges(), |w, b| {
+        write_bridge_v1(w, b)
     })?;
-    Optional::write(&mut writer, tree.current_bridge().as_ref(), |mut w, b| {
-        write_bridge_v1(&mut w, b)
+    Optional::write(&mut writer, tree.current_bridge().as_ref(), |w, b| {
+        write_bridge_v1(w, b)
     })?;
     Vector::write_sized(
         &mut writer,
diff --git a/src/rust/src/metrics_ffi.rs b/src/rust/src/metrics_ffi.rs
index 8cf995eb7..35306ef9d 100644
--- a/src/rust/src/metrics_ffi.rs
+++ b/src/rust/src/metrics_ffi.rs
@@ -210,7 +210,7 @@ pub extern "C" fn metrics_increment_counter(key: *mut FfiKey, value: u64) {
 pub extern "C" fn metrics_static_update_gauge(callsite: *const FfiCallsite, value: c_double) {
     if let Some(recorder) = try_recorder() {
         let callsite = unsafe { callsite.as_ref().unwrap() };
-        recorder.register_gauge(&callsite.key).set(value as f64);
+        recorder.register_gauge(&callsite.key).set(value);
     }
 }
 
@@ -219,7 +219,7 @@ pub extern "C" fn metrics_update_gauge(key: *mut FfiKey, value: c_double) {
     if let Some(recorder) = try_recorder() {
         if !key.is_null() {
             let key = unsafe { Box::from_raw(key) };
-            recorder.register_gauge(&key.inner).set(value as f64);
+            recorder.register_gauge(&key.inner).set(value);
         }
     }
 }
@@ -228,9 +228,7 @@ pub extern "C" fn metrics_update_gauge(key: *mut FfiKey, value: c_double) {
 pub extern "C" fn metrics_static_increment_gauge(callsite: *const FfiCallsite, value: c_double) {
     if let Some(recorder) = try_recorder() {
         let callsite = unsafe { callsite.as_ref().unwrap() };
-        recorder
-            .register_gauge(&callsite.key)
-            .increment(value as f64);
+        recorder.register_gauge(&callsite.key).increment(value);
     }
 }
 
@@ -239,7 +237,7 @@ pub extern "C" fn metrics_increment_gauge(key: *mut FfiKey, value: c_double) {
     if let Some(recorder) = try_recorder() {
         if !key.is_null() {
             let key = unsafe { Box::from_raw(key) };
-            recorder.register_gauge(&key.inner).increment(value as f64);
+            recorder.register_gauge(&key.inner).increment(value);
         }
     }
 }
@@ -248,9 +246,7 @@ pub extern "C" fn metrics_increment_gauge(key: *mut FfiKey, value: c_double) {
 pub extern "C" fn metrics_static_decrement_gauge(callsite: *const FfiCallsite, value: c_double) {
     if let Some(recorder) = try_recorder() {
         let callsite = unsafe { callsite.as_ref().unwrap() };
-        recorder
-            .register_gauge(&callsite.key)
-            .decrement(value as f64);
+        recorder.register_gauge(&callsite.key).decrement(value);
     }
 }
 
@@ -259,7 +255,7 @@ pub extern "C" fn metrics_decrement_gauge(key: *mut FfiKey, value: c_double) {
     if let Some(recorder) = try_recorder() {
         if !key.is_null() {
             let key = unsafe { Box::from_raw(key) };
-            recorder.register_gauge(&key.inner).decrement(value as f64);
+            recorder.register_gauge(&key.inner).decrement(value);
         }
     }
 }
@@ -268,9 +264,7 @@ pub extern "C" fn metrics_decrement_gauge(key: *mut FfiKey, value: c_double) {
 pub extern "C" fn metrics_static_record_histogram(callsite: *const FfiCallsite, value: c_double) {
     if let Some(recorder) = try_recorder() {
         let callsite = unsafe { callsite.as_ref().unwrap() };
-        recorder
-            .register_histogram(&callsite.key)
-            .record(value as f64);
+        recorder.register_histogram(&callsite.key).record(value);
     }
 }
 
@@ -279,7 +273,7 @@ pub extern "C" fn metrics_record_histogram(key: *mut FfiKey, value: c_double) {
     if let Some(recorder) = try_recorder() {
         if !key.is_null() {
             let key = unsafe { Box::from_raw(key) };
-            recorder.register_histogram(&key.inner).record(value as f64);
+            recorder.register_histogram(&key.inner).record(value);
         }
     }
 }