formatting and clippy

rkuris · rkuris · commit 45ed05252b94 · 2026-03-04T13:43:51.000-08:00
diff --git a/ffi/src/handle.rs b/ffi/src/handle.rs
@@ -224,7 +224,10 @@ impl DatabaseHandle {
             self.create_proposal_handle(values.as_ref())?;
 
         let root_hash = handle.commit_proposal(|commit_time| {
-            firewood_increment!(crate::registry::COMMIT_SECONDS_TOTAL, commit_time.as_nanos() as u64);
+            firewood_increment!(
+                crate::registry::COMMIT_SECONDS_TOTAL,
+                commit_time.as_nanos()
+            );
             firewood_record!(
                 crate::registry::COMMIT_DURATION_SECONDS,
                 commit_time.as_f64(),
@@ -233,7 +236,7 @@ impl DatabaseHandle {
         })?;
 
         let elapsed = start_time.elapsed();
-        firewood_increment!(crate::registry::BATCH_SECONDS_TOTAL, elapsed.as_nanos() as u64);
+        firewood_increment!(crate::registry::BATCH_SECONDS_TOTAL, elapsed.as_nanos());
         firewood_increment!(crate::registry::BATCH_TOTAL, 1);
         firewood_record!(
             crate::registry::BATCH_DURATION_SECONDS,
diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs
@@ -518,7 +518,10 @@ pub extern "C" fn fwd_commit_proposal(proposal: Option<Box<ProposalHandle<'_>>>)
 
     let result = invoke_with_handle(proposal, move |proposal| {
         proposal.commit_proposal(|commit_time| {
-            firewood_increment!(crate::registry::COMMIT_SECONDS_TOTAL, commit_time.as_nanos() as u64);
+            firewood_increment!(
+                crate::registry::COMMIT_SECONDS_TOTAL,
+                commit_time.as_nanos()
+            );
             firewood_increment!(crate::registry::COMMIT_TOTAL, 1);
             firewood_record!(
                 crate::registry::COMMIT_DURATION_SECONDS,
diff --git a/ffi/src/proofs/change.rs b/ffi/src/proofs/change.rs
@@ -248,7 +248,7 @@ impl<'db> ProposedChangeProofContext<'db> {
         };
 
         let metrics_cb = |commit_time: coarsetime::Duration| {
-            firewood_increment!(crate::registry::COMMIT_SECONDS_TOTAL, commit_time.as_nanos() as u64, "change" => "commit");
+            firewood_increment!(crate::registry::COMMIT_SECONDS_TOTAL, commit_time.as_nanos(), "change" => "commit");
             firewood_increment!(crate::registry::MERGE_TOTAL, 1, "change" => "commit");
         };
 
diff --git a/ffi/src/proofs/range.rs b/ffi/src/proofs/range.rs
@@ -225,7 +225,10 @@ impl<'db> RangeProofContext<'db> {
         };
 
         let metrics_cb = |commit_time: coarsetime::Duration| {
-            firewood_increment!(crate::registry::COMMIT_SECONDS_TOTAL, commit_time.as_nanos() as u64);
+            firewood_increment!(
+                crate::registry::COMMIT_SECONDS_TOTAL,
+                commit_time.as_nanos()
+            );
             firewood_increment!(crate::registry::MERGE_TOTAL, 1);
         };
 
diff --git a/ffi/src/proposal.rs b/ffi/src/proposal.rs
@@ -130,7 +130,10 @@ impl<'db> CreateProposalResult<'db> {
         let start_time = coarsetime::Instant::now();
         let proposal = f()?;
         let propose_time = start_time.elapsed();
-        firewood_increment!(crate::registry::PROPOSE_SECONDS_TOTAL, propose_time.as_nanos() as u64);
+        firewood_increment!(
+            crate::registry::PROPOSE_SECONDS_TOTAL,
+            propose_time.as_nanos()
+        );
         firewood_increment!(crate::registry::PROPOSE_TOTAL, 1);
         firewood_record!(
             crate::registry::PROPOSE_DURATION_SECONDS,
diff --git a/ffi/src/registry.rs b/ffi/src/registry.rs
@@ -32,7 +32,10 @@ const FFI_TIMING_BUCKETS: &[f64] = &[
 ///
 /// Histogram bucket configurations are collected into the provided vector.
 pub fn register(histogram_configs: &mut Vec<HistogramBucketConfig>) {
-    describe_counter!(COMMIT_SECONDS_TOTAL, "Time spent committing via FFI (seconds)");
+    describe_counter!(
+        COMMIT_SECONDS_TOTAL,
+        "Time spent committing via FFI (seconds)"
+    );
     describe_counter!(COMMIT_TOTAL, "Count of commit operations via FFI");
     register_histogram_with_buckets(
         histogram_configs,
@@ -41,7 +44,10 @@ pub fn register(histogram_configs: &mut Vec<HistogramBucketConfig>) {
         FFI_TIMING_BUCKETS,
     );
 
-    describe_counter!(PROPOSE_SECONDS_TOTAL, "Time spent proposing via FFI (seconds)");
+    describe_counter!(
+        PROPOSE_SECONDS_TOTAL,
+        "Time spent proposing via FFI (seconds)"
+    );
     describe_counter!(PROPOSE_TOTAL, "Count of proposal operations via FFI");
     register_histogram_with_buckets(
         histogram_configs,
@@ -50,7 +56,10 @@ pub fn register(histogram_configs: &mut Vec<HistogramBucketConfig>) {
         FFI_TIMING_BUCKETS,
     );
 
-    describe_counter!(BATCH_SECONDS_TOTAL, "Time spent processing batches (seconds)");
+    describe_counter!(
+        BATCH_SECONDS_TOTAL,
+        "Time spent processing batches (seconds)"
+    );
     describe_counter!(BATCH_TOTAL, "Count of batch operations completed");
     register_histogram_with_buckets(
         histogram_configs,
diff --git a/firewood/src/merkle/mod.rs b/firewood/src/merkle/mod.rs
@@ -869,7 +869,7 @@ impl<S: ReadableStorage> Merkle<NodeStore<MutableProposal, S>> {
             return Ok(None);
         };
 
-       let (root_node, removed_value) = self.remove_helper(root_node, &key)?;
+        let (root_node, removed_value) = self.remove_helper(root_node, &key)?;
         *self.nodestore.root_mut() = root_node;
         if removed_value.is_some() {
             firewood_increment!(crate::registry::REMOVE_TOTAL, 1, "prefix" => "false", "result" => "success");
diff --git a/replay/src/lib.rs b/replay/src/lib.rs
@@ -249,7 +249,10 @@ fn apply_operation<'db>(
             let ops = into_batch_ops(pairs);
             let start = Instant::now();
             let proposal = DbApi::propose(db, ops)?;
-            firewood_increment!(registry::PROPOSE_SECONDS_TOTAL, start.elapsed().as_nanos() as u64);
+            firewood_increment!(
+                registry::PROPOSE_SECONDS_TOTAL,
+                start.elapsed().as_nanos() as u64
+            );
             firewood_increment!(registry::PROPOSE_TOTAL, 1);
             proposals.insert(returned_proposal_id, proposal);
             Ok(None)
@@ -264,7 +267,10 @@ fn apply_operation<'db>(
             let start = Instant::now();
             let parent = get_proposal(proposals, proposal_id)?;
             let new_proposal = ProposalApi::propose(parent, ops)?;
-            firewood_increment!(registry::PROPOSE_SECONDS_TOTAL, start.elapsed().as_nanos() as u64);
+            firewood_increment!(
+                registry::PROPOSE_SECONDS_TOTAL,
+                start.elapsed().as_nanos() as u64
+            );
             firewood_increment!(registry::PROPOSE_TOTAL, 1);
             proposals.insert(returned_proposal_id, new_proposal);
             Ok(None)
@@ -277,7 +283,10 @@ fn apply_operation<'db>(
             let proposal = take_proposal(proposals, proposal_id)?;
             let start = Instant::now();
             proposal.commit()?;
-            firewood_increment!(registry::COMMIT_SECONDS_TOTAL, start.elapsed().as_nanos() as u64);
+            firewood_increment!(
+                registry::COMMIT_SECONDS_TOTAL,
+                start.elapsed().as_nanos() as u64
+            );
             firewood_increment!(registry::COMMIT_TOTAL, 1);
             Ok(returned_hash)
         }
diff --git a/storage/src/linear/filebacked.rs b/storage/src/linear/filebacked.rs
@@ -256,7 +256,7 @@ impl<'a> PredictiveReader<'a> {
 impl Drop for PredictiveReader<'_> {
     fn drop(&mut self) {
         let elapsed = self.started.elapsed();
-        firewood_increment!(crate::registry::IO_READ_SECONDS_TOTAL, elapsed.as_nanos() as u64);
+        firewood_increment!(crate::registry::IO_READ_SECONDS_TOTAL, elapsed.as_nanos());
         firewood_increment!(crate::registry::IO_READ_TOTAL, 1);
     }
 }
diff --git a/storage/src/nodestore/persist.rs b/storage/src/nodestore/persist.rs
@@ -191,7 +191,7 @@ impl<S: WritableStorage> NodeStore<Committed, S> {
 
         self.process_unpersisted_nodes(&mut bump, &mut node_allocator, super::INITIAL_BUMP_SIZE)?;
 
-        let flush_time = flush_start.elapsed().as_nanos() as u64;
+        let flush_time = flush_start.elapsed().as_nanos();
         firewood_increment!(crate::registry::FLUSH_NODES_SECONDS_TOTAL, flush_time);
 
         Ok(())
diff --git a/storage/src/registry.rs b/storage/src/registry.rs
@@ -55,10 +55,16 @@ pub fn register() {
         SPACE_REUSED_BYTES_TOTAL,
         "Amount of space reused from free lists (bytes)"
     );
-    describe_counter!(SPACE_FROM_END_BYTES_TOTAL, "Amount of space allocated from end (bytes)");
+    describe_counter!(
+        SPACE_FROM_END_BYTES_TOTAL,
+        "Amount of space allocated from end (bytes)"
+    );
     describe_counter!(SPACE_FREED_BYTES_TOTAL, "Amount of space freed (bytes)");
     describe_counter!(DELETE_NODE_TOTAL, "Count of deleted nodes");
-    describe_counter!(FLUSH_NODES_SECONDS_TOTAL, "Time spent flushing nodes (seconds)");
+    describe_counter!(
+        FLUSH_NODES_SECONDS_TOTAL,
+        "Time spent flushing nodes (seconds)"
+    );
 
     describe_counter!(READ_NODE_TOTAL, "Number of node reads");
     describe_counter!(CACHE_NODE_TOTAL, "Number of node cache operations");
@@ -85,8 +91,14 @@ pub fn register() {
     );
 
     // Ring metrics
-    describe_counter!(ring::EAGAIN_WRITE_RETRY_TOTAL, "Count of EAGAIN write retries");
+    describe_counter!(
+        ring::EAGAIN_WRITE_RETRY_TOTAL,
+        "Count of EAGAIN write retries"
+    );
     describe_counter!(ring::FULL_TOTAL, "Count of ring buffer full events");
     describe_counter!(ring::SQ_WAIT_TOTAL, "Count of submission queue waits");
-    describe_counter!(ring::PARTIAL_WRITE_RETRY_TOTAL, "Count of partial write retries");
+    describe_counter!(
+        ring::PARTIAL_WRITE_RETRY_TOTAL,
+        "Count of partial write retries"
+    );
 }

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ impl<'a> PredictiveReader<'a> {`
`256`	`256`	`impl Drop for PredictiveReader<'_> {`
`257`	`257`	`fn drop(&mut self) {`
`258`	`258`	`let elapsed = self.started.elapsed();`
`259`		`- firewood_increment!(crate::registry::IO_READ_SECONDS_TOTAL, elapsed.as_nanos() as u64);`
	`259`	`+ firewood_increment!(crate::registry::IO_READ_SECONDS_TOTAL, elapsed.as_nanos());`
`260`	`260`	`firewood_increment!(crate::registry::IO_READ_TOTAL, 1);`
`261`	`261`	`}`
`262`	`262`	`}`