chore: Add clippy settings to Cargo.toml

alloy-rs · Dec 4, 2024 · 37b8524 · 37b8524
1 parent 2440a48
commit 37b8524
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,6 +19,24 @@ homepage = "https://github.com/alloy-rs/trie"
 repository = "https://github.com/alloy-rs/trie"
 exclude = [".github/", "deny.toml", "release.toml", "rustfmt.toml"]
 
+[lints.rust]
+missing-debug-implementations = "warn"
+missing-docs = "warn"
+unreachable-pub = "warn"
+unused-must-use = "deny"
+rust-2018-idioms = "deny"
+unnameable-types = "warn"
+
+[lints.rustdoc]
+all = "warn"
+
+[lints.clippy]
+all = { level = "warn", priority = -1 }
+missing-const-for-fn = "warn"
+use-self = "warn"
+option-if-let-else = "warn"
+redundant-clone = "warn"
+
 [dependencies]
 alloy-primitives = { version = "0.8.14", default-features = false, features = [
     "rlp",

diff --git a/benches/bench.rs b/benches/bench.rs
@@ -1,3 +1,5 @@
+#![allow(missing_docs)]
+
 use alloy_trie::nodes::encode_path_leaf;
 use criterion::{
     criterion_group, criterion_main, measurement::WallTime, BenchmarkGroup, Criterion,

diff --git a/src/hash_builder/mod.rs b/src/hash_builder/mod.rs
@@ -169,15 +169,9 @@ impl HashBuilder {
     }
 
     fn current_root(&self) -> B256 {
-        if let Some(node_ref) = self.stack.last() {
-            if let Some(hash) = node_ref.as_hash() {
-                hash
-            } else {
-                keccak256(node_ref)
-            }
-        } else {
-            EMPTY_ROOT_HASH
-        }
+        self.stack.last().map_or(EMPTY_ROOT_HASH, |node_ref| {
+            node_ref.as_hash().map_or_else(|| keccak256(node_ref), |hash| hash)
+        })
     }
 
     /// Given a new element, it appends it to the stack and proceeds to loop through the stack state

diff --git a/src/proof/error.rs b/src/proof/error.rs
@@ -34,7 +34,7 @@ impl std::error::Error for ProofVerificationError {
     fn source(&self) -> ::core::option::Option<&(dyn std::error::Error + 'static)> {
         #[allow(deprecated)]
         match self {
-            ProofVerificationError::Rlp { 0: transparent } => {
+            Self::Rlp { 0: transparent } => {
                 std::error::Error::source(transparent as &dyn std::error::Error)
             }
             _ => None,
@@ -45,22 +45,22 @@ impl std::error::Error for ProofVerificationError {
 impl fmt::Display for ProofVerificationError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            ProofVerificationError::RootMismatch { got, expected } => {
+            Self::RootMismatch { got, expected } => {
                 write!(f, "root mismatch. got: {got}. expected: {expected}")
             }
-            ProofVerificationError::ValueMismatch { path, got, expected } => {
+            Self::ValueMismatch { path, got, expected } => {
                 write!(f, "value mismatch at path {path:?}. got: {got:?}. expected: {expected:?}")
             }
-            ProofVerificationError::UnexpectedEmptyRoot => {
+            Self::UnexpectedEmptyRoot => {
                 write!(f, "unexpected empty root node")
             }
-            ProofVerificationError::Rlp(error) => fmt::Display::fmt(error, f),
+            Self::Rlp(error) => fmt::Display::fmt(error, f),
         }
     }
 }
 
 impl From<alloy_rlp::Error> for ProofVerificationError {
     fn from(source: alloy_rlp::Error) -> Self {
-        ProofVerificationError::Rlp(source)
+        Self::Rlp(source)
     }
 }
diff --git a/src/proof/verify.rs b/src/proof/verify.rs
@@ -101,8 +101,8 @@ impl Deref for NodeDecodingResult {
 
     fn deref(&self) -> &Self::Target {
         match self {
-            NodeDecodingResult::Node(node) => node.as_slice(),
-            NodeDecodingResult::Value(value) => value,
+            Self::Node(node) => node.as_slice(),
+            Self::Value(value) => value,
         }
     }
 }
@@ -332,7 +332,7 @@ mod tests {
         assert_eq!(
             verify_proof(
                 root,
-                target.clone(),
+                target,
                 Some(value.to_vec()),
                 proof.into_nodes_sorted().iter().map(|(_, node)| node)
             ),
@@ -510,7 +510,7 @@ mod tests {
                 },
                 {
                     buffer.clear();
-                    TrieNode::Leaf(LeafNode::new(Nibbles::from_nibbles([0xb]), value.clone()))
+                    TrieNode::Leaf(LeafNode::new(Nibbles::from_nibbles([0xb]), value))
                         .rlp(&mut buffer)
                 },
             ],