Merge pull request #946 from openmina/fix-clippy

Fix clippy lints for toolchain 1.83

Author: sebastiencs

.github/workflows/lint.yml

@@ -17,7 +17,7 @@ jobs:
           sudo apt install -y protobuf-compiler
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.81
+          toolchain: 1.83
           components: rustfmt, clippy
           default: true
       - uses: actions-rs/cargo@v1

core/src/snark/snark_cmp.rs

@@ -11,13 +11,13 @@ pub struct SnarkCmp<'a> {
     pub prover: &'a NonZeroCurvePoint,
 }
 
-impl<'a> SnarkCmp<'a> {
+impl SnarkCmp<'_> {
     pub fn tie_breaker_hash(&self) -> [u8; 32] {
         super::tie_breaker_hash(&self.job_id, self.prover)
     }
 }
 
-impl<'a> Ord for SnarkCmp<'a> {
+impl Ord for SnarkCmp<'_> {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
         self.job_id
             .cmp(&other.job_id)
@@ -26,7 +26,7 @@ impl<'a> Ord for SnarkCmp<'a> {
     }
 }
 
-impl<'a> PartialOrd for SnarkCmp<'a> {
+impl PartialOrd for SnarkCmp<'_> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         Some(self.cmp(other))
     }

ledger/src/generators/zkapp_command.rs

@@ -47,8 +47,8 @@ use crate::{
 
 use super::{Failure, NotPermitedOf, Role};
 
-/// Value when we run `dune runtest src/lib/staged_ledger -f`
-//const ACCOUNT_CREATION_FEE: Fee = Fee::from_u64(1000000000);
+// /// Value when we run `dune runtest src/lib/staged_ledger -f`
+// const ACCOUNT_CREATION_FEE: Fee = Fee::from_u64(1000000000);
 
 /// https://github.com/MinaProtocol/mina/blob/2ff0292b637684ce0372e7b8e23ec85404dc5091/src/lib/mina_generators/zkapp_command_generators.ml#L443
 fn gen_invalid_protocol_state_precondition(psv: &ProtocolStateView) -> ZkAppPreconditions {

ledger/src/ondisk/compression.rs

@@ -3,7 +3,7 @@ pub enum MaybeCompressed<'a> {
     No(&'a [u8]),
 }
 
-impl<'a> AsRef<[u8]> for MaybeCompressed<'a> {
+impl AsRef<[u8]> for MaybeCompressed<'_> {
     fn as_ref(&self) -> &[u8] {
         match self {
             MaybeCompressed::Compressed(c) => c,

ledger/src/proofs/block.rs

@@ -636,7 +636,7 @@ mod vrf {
         delegator_bits: [bool; 35],
     }
 
-    impl<'a> ToInputs for Message<'a> {
+    impl ToInputs for Message<'_> {
         fn to_inputs(&self, inputs: &mut Inputs) {
             let Self {
                 global_slot,

ledger/src/proofs/wrap.rs

@@ -1848,7 +1848,8 @@ pub mod wrap_verifier {
     pub const OPS_BITS_PER_CHUNK: usize = 5;
 
     pub fn chunks_needed(num_bits: usize) -> usize {
-        (num_bits + (OPS_BITS_PER_CHUNK - 1)) / OPS_BITS_PER_CHUNK
+        // (num_bits + (OPS_BITS_PER_CHUNK - 1)) / OPS_BITS_PER_CHUNK
+        num_bits.div_ceil(OPS_BITS_PER_CHUNK)
     }
 
     fn lagrange_with_correction(

ledger/src/scan_state/parallel_scan.rs

@@ -422,7 +422,7 @@ where
             Merge(&'a merge::Merge<M>),
         }
 
-        impl<'a, B, M> Debug for BaseOrMerge<'a, B, M>
+        impl<B, M> Debug for BaseOrMerge<'_, B, M>
         where
             B: Debug,
             M: Debug,
@@ -818,7 +818,7 @@ pub struct JobValueWithIndex<'a> {
     pub job: JobValue<'a>,
 }
 
-impl<'a> JobValueWithIndex<'a> {
+impl JobValueWithIndex<'_> {
     pub fn index(&self) -> usize {
         self.index
     }

ledger/src/scan_state/transaction_logic.rs

@@ -5428,10 +5428,10 @@ pub mod local_state {
         }
     }
 
-    /// NOTE: It looks like there are different instances of the polymorphic LocalEnv type
-    /// One with concrete types for the stack frame, call stack, and ledger. Created from the Env
-    /// And the other with their hashes. To differentiate them I renamed the first LocalStateEnv
-    /// Maybe a better solution is to keep the LocalState name and put it under a different module
+    // NOTE: It looks like there are different instances of the polymorphic LocalEnv type
+    // One with concrete types for the stack frame, call stack, and ledger. Created from the Env
+    // And the other with their hashes. To differentiate them I renamed the first LocalStateEnv
+    // Maybe a better solution is to keep the LocalState name and put it under a different module
     // pub type LocalStateEnv<L> = LocalStateSkeleton<
     //     L,                            // ledger
     //     StackFrame,                   // stack_frame

ledger/src/staged_ledger/validate_block.rs

@@ -185,7 +185,8 @@ fn required_bitswap_block_count(max_block_size: usize, data_length: usize) -> us
     } else {
         let n1 = data_length - LINK_SIZE;
         let n2 = max_block_size - LINK_SIZE - 2;
-        (n1 + n2 - 1) / n2
+        // (n1 + n2 - 1) / n2
+        n1.div_ceil(n2)
     }
 }
 

ledger/src/util/backtrace.rs

@@ -16,7 +16,7 @@ pub fn short_backtrace() -> String {
         .map(|sym| (sym.filename(), sym.name(), sym.lineno()))
         .enumerate()
         .filter(|(_, (filename, name, _))| {
-            return !(filename
+            !(filename
                 .map(|filename| {
                     filename.ends_with("ledger/src/util/backtrace.rs")
                         || filename
@@ -34,7 +34,7 @@ pub fn short_backtrace() -> String {
                             || name.starts_with("camlCamlinternalLazy__")
                             || name.starts_with("camlO1trace__") // This belongs to the mina repo, but useless to us
                     })
-                    .unwrap_or(false));
+                    .unwrap_or(false))
         })
         .take_while(|(_, (_, name, _))| {
             name.as_ref().and_then(|n| n.as_str()) != Some("caml_program")