Merge pull request #5986 from obycode/chore/clippy-updates

chore: fixes for latest clippy checks

Author: wileyj

pox-locking/src/pox_2.rs

@@ -173,8 +173,8 @@ pub fn parse_pox_increase(result: &Value) -> std::result::Result<(PrincipalData,
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v2 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v2 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_increase_v2(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,
@@ -226,8 +226,8 @@ pub fn pox_lock_increase_v2(
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v2 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v2 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_extend_v2(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,

pox-locking/src/pox_3.rs

@@ -96,8 +96,8 @@ pub fn pox_lock_v3(
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v3 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v3 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_extend_v3(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,
@@ -132,8 +132,8 @@ pub fn pox_lock_extend_v3(
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v3 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v3 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_increase_v3(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,

pox-locking/src/pox_4.rs

@@ -69,8 +69,8 @@ pub fn pox_lock_v4(
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v4 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v4 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_extend_v4(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,
@@ -105,8 +105,8 @@ pub fn pox_lock_extend_v4(
 ///
 /// # Errors
 /// - Returns Error::PoxExtendNotLocked if this function was called on an account
-///     which isn't locked. This *should* have been checked by the PoX v4 contract,
-///     so this should surface in a panic.
+///   which isn't locked. This *should* have been checked by the PoX v4 contract,
+///   so this should surface in a panic.
 pub fn pox_lock_increase_v4(
     db: &mut ClarityDatabase,
     principal: &PrincipalData,

stacks-common/src/deps_common/bitcoin/blockdata/block.rs

@@ -101,7 +101,7 @@ impl BlockHeader {
 
     /// Computes the target value in float format from Uint256 format.
     pub fn compact_target_from_u256(value: &Uint256) -> u32 {
-        let mut size = (value.bits() + 7) / 8;
+        let mut size = value.bits().div_ceil(8);
         let mut compact = if size <= 3 {
             (value.low_u64() << (8 * (3 - size))) as u32
         } else {

stacks-common/src/deps_common/bitcoin/util/hash.rs

@@ -436,7 +436,7 @@ pub fn bitcoin_merkle_root(data: Vec<Sha256dHash>) -> Sha256dHash {
         return data[0];
     }
     // Recursion
-    let iterations = (data.len() + 1) / 2;
+    let iterations = data.len().div_ceil(2);
     let mut next = Vec::with_capacity(iterations);
     for idx in 0..iterations {
         let idx1 = 2 * idx;

stacks-common/src/util/secp256k1/native.rs

@@ -94,10 +94,7 @@ impl MessageSignature {
         let mut sig_bytes = [0u8; 64];
         sig_bytes[..64].copy_from_slice(&self.0[1..=64]);
 
-        match LibSecp256k1RecoverableSignature::from_compact(&sig_bytes, recid) {
-            Ok(sig) => Some(sig),
-            Err(_) => None,
-        }
+        LibSecp256k1RecoverableSignature::from_compact(&sig_bytes, recid).ok()
     }
 
     /// Convert from VRS to RSV