clippy fix

Cyfrin · Dec 12, 2024 · db349c4 · db349c4
1 parent 2cda3d3
commit db349c4
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 26 deletions.
diff --git a/aderyn_core/src/context/browser/extractor.rs b/aderyn_core/src/context/browser/extractor.rs
@@ -147,7 +147,7 @@ impl<'a> ExtractReferencedDeclarationsConditionally<'a> {
     }
 }
 
-impl<'a> ASTConstVisitor for ExtractReferencedDeclarationsConditionally<'a> {
+impl ASTConstVisitor for ExtractReferencedDeclarationsConditionally<'_> {
     fn visit_member_access(&mut self, node: &MemberAccess) -> Result<bool> {
         if !self.condition.as_ref()(node.id, self.context) {
             return Ok(true);

diff --git a/aderyn_core/src/context/browser/storage_vars.rs b/aderyn_core/src/context/browser/storage_vars.rs
@@ -61,7 +61,7 @@ impl<'a> Add<ApproximateStorageChangeFinder<'_>> for ApproximateStorageChangeFin
     }
 }
 
-impl<'a> Debug for ApproximateStorageChangeFinder<'a> {
+impl Debug for ApproximateStorageChangeFinder<'_> {
     // Do not print context. Hence, debug is custom derived for this struct
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         writeln!(f, "Manipulated directly: {:?}", self.directly_manipulated_state_variables)?;
@@ -213,7 +213,7 @@ impl<'a> ApproximateStorageChangeFinder<'a> {
     }
 }
 
-impl<'a> ASTConstVisitor for ApproximateStorageChangeFinder<'a> {
+impl ASTConstVisitor for ApproximateStorageChangeFinder<'_> {
     fn visit_unary_operation(&mut self, node: &UnaryOperation) -> Result<bool> {
         // WRITE HEURISTICS
         // Catch unary operations that manipulate variables

diff --git a/aderyn_core/src/context/graph/callgraph_tests.rs b/aderyn_core/src/context/graph/callgraph_tests.rs
@@ -157,7 +157,7 @@ mod callgraph_test_functions {
         outward_side_effects_modifier_definitions_names: Vec<String>,
     }
 
-    impl<'a> Tracker<'a> {
+    impl Tracker<'_> {
         fn new(context: &WorkspaceContext) -> Tracker {
             Tracker {
                 context,

diff --git a/aderyn_core/src/detect/high/const_func_change_state.rs b/aderyn_core/src/detect/high/const_func_change_state.rs
@@ -74,7 +74,7 @@ struct StateVariableChangeTracker<'a> {
     context: &'a WorkspaceContext,
 }
 
-impl<'a> CallGraphVisitor for StateVariableChangeTracker<'a> {
+impl CallGraphVisitor for StateVariableChangeTracker<'_> {
     fn visit_any(&mut self, node: &crate::ast::ASTNode) -> eyre::Result<()> {
         if self.state_var_has_changed {
             return Ok(());

diff --git a/aderyn_core/src/detect/high/delegate_call_no_address_check.rs b/aderyn_core/src/detect/high/delegate_call_no_address_check.rs
@@ -71,7 +71,7 @@ struct DelegateCallNoAddressChecksTracker<'a> {
     context: &'a WorkspaceContext,
 }
 
-impl<'a> CallGraphVisitor for DelegateCallNoAddressChecksTracker<'a> {
+impl CallGraphVisitor for DelegateCallNoAddressChecksTracker<'_> {
     fn visit_any(&mut self, node: &crate::context::workspace_context::ASTNode) -> eyre::Result<()> {
         if !self.has_address_checks && helpers::has_binary_checks_on_some_address(node) {
             self.has_address_checks = true;

diff --git a/aderyn_core/src/detect/high/incorrect_erc20_interface.rs b/aderyn_core/src/detect/high/incorrect_erc20_interface.rs
@@ -113,7 +113,7 @@ mod erc_matching_function_signature_helper {
     }
 
     // Helps with checking if a function definition satisifed a signature matcher
-    impl<'a> SignatureMatcher<'a> {
+    impl SignatureMatcher<'_> {
         fn satisfies(&self, func: &FunctionDefinition) -> Option<bool> {
             if func.name != self.name {
                 return Some(false);

diff --git a/aderyn_core/src/detect/high/incorrect_erc721_interface.rs b/aderyn_core/src/detect/high/incorrect_erc721_interface.rs
@@ -127,7 +127,7 @@ mod erc721_matching_function_signature_helper {
     }
 
     // Helps with checking if a function definition satisifed a signature matcher
-    impl<'a> SignatureMatcher<'a> {
+    impl SignatureMatcher<'_> {
         fn satisfies(&self, func: &FunctionDefinition) -> bool {
             if func.name != self.name {
                 return false;

diff --git a/aderyn_core/src/detect/high/nested_struct_in_mapping.rs b/aderyn_core/src/detect/high/nested_struct_in_mapping.rs
@@ -29,7 +29,7 @@ fn version_req_allows_below_0_5_0(version_req: &VersionReq) -> bool {
     }
 
     let comparator = &version_req.comparators[0];
-    comparator.major == 0 && comparator.minor.map_or(false, |m| m < 5)
+    comparator.major == 0 && comparator.minor.is_some_and(|m| m < 5)
 }
 
 impl IssueDetector for NestedStructInMappingDetector {

diff --git a/aderyn_core/src/detect/high/state_variable_shadowing.rs b/aderyn_core/src/detect/high/state_variable_shadowing.rs
@@ -107,7 +107,7 @@ fn allows_below_0_6_0(version_req: &VersionReq) -> bool {
     }
 
     let comparator = &version_req.comparators[0];
-    comparator.major == 0 && comparator.minor.map_or(false, |m| m < 6)
+    comparator.major == 0 && comparator.minor.is_some_and(|m| m < 6)
 }
 
 impl IssueDetector for StateVariableShadowingDetector {

diff --git a/aderyn_core/src/detect/low/assert_state_change.rs b/aderyn_core/src/detect/low/assert_state_change.rs
@@ -69,7 +69,7 @@ mod assert_state_change_tracker {
         context: &'a WorkspaceContext,
     }
 
-    impl<'a> CallGraphVisitor for StateVariableChangeTracker<'a> {
+    impl CallGraphVisitor for StateVariableChangeTracker<'_> {
         fn visit_any(&mut self, node: &crate::ast::ASTNode) -> eyre::Result<()> {
             if self.has_some_state_variable_changed {
                 return Ok(());

diff --git a/aderyn_core/src/detect/low/cache_array_length.rs b/aderyn_core/src/detect/low/cache_array_length.rs
@@ -160,7 +160,7 @@ mod loop_investigation_helper {
         changes: Option<ApproximateStorageChangeFinder<'a>>,
     }
 
-    impl<'a> CallGraphVisitor for StateVariableChangeTracker<'a> {
+    impl CallGraphVisitor for StateVariableChangeTracker<'_> {
         fn visit_any(&mut self, node: &ASTNode) -> eyre::Result<()> {
             let changes = ApproximateStorageChangeFinder::from(self.context, node);
             if self.changes.is_none() {

diff --git a/aderyn_core/src/detect/low/costly_operations_inside_loops.rs b/aderyn_core/src/detect/low/costly_operations_inside_loops.rs
@@ -80,7 +80,7 @@ struct StateVariableChangeTracker<'a> {
     context: &'a WorkspaceContext,
 }
 
-impl<'a> CallGraphVisitor for StateVariableChangeTracker<'a> {
+impl CallGraphVisitor for StateVariableChangeTracker<'_> {
     fn visit_any(&mut self, node: &crate::ast::ASTNode) -> eyre::Result<()> {
         if self.state_var_has_changed {
             return Ok(());

diff --git a/aderyn_core/src/detect/low/deprecated_oz_functions.rs b/aderyn_core/src/detect/low/deprecated_oz_functions.rs
@@ -30,8 +30,7 @@ impl IssueDetector for DeprecatedOZFunctionsDetector {
                 if import_directives.iter().any(|directive| {
                     directive
                         .absolute_path
-                        .as_ref()
-                        .map_or(false, |path| path.contains("openzeppelin"))
+                        .as_ref().is_some_and(|path| path.contains("openzeppelin"))
                 }) && identifier.name == "_setupRole"
                 {
                     capture!(self, context, identifier);
@@ -50,8 +49,7 @@ impl IssueDetector for DeprecatedOZFunctionsDetector {
                 if import_directives.iter().any(|directive| {
                     directive
                         .absolute_path
-                        .as_ref()
-                        .map_or(false, |path| path.contains("openzeppelin"))
+                        .as_ref().is_some_and(|path| path.contains("openzeppelin"))
                 }) && member_access.member_name == "safeApprove"
                 {
                     capture!(self, context, member_access);

diff --git a/aderyn_core/src/detect/low/function_init_state_vars.rs b/aderyn_core/src/detect/low/function_init_state_vars.rs
@@ -93,7 +93,7 @@ impl<'a> NonConstantStateVariableReferenceDeclarationTracker<'a> {
     }
 }
 
-impl<'a> CallGraphVisitor for NonConstantStateVariableReferenceDeclarationTracker<'a> {
+impl CallGraphVisitor for NonConstantStateVariableReferenceDeclarationTracker<'_> {
     fn visit_any(&mut self, node: &ASTNode) -> eyre::Result<()> {
         // We already know the condition is satisifed
         if self.makes_a_reference {

diff --git a/aderyn_core/src/detect/low/missing_inheritance.rs b/aderyn_core/src/detect/low/missing_inheritance.rs
@@ -74,7 +74,7 @@ impl IssueDetector for MissingInheritanceDetector {
                 continue;
             }
             if let Some(ASTNode::ContractDefinition(c)) = context.nodes.get(contract_id) {
-                if c.kind != ContractKind::Contract || c.is_abstract.map_or(false, identity) {
+                if c.kind != ContractKind::Contract || c.is_abstract.is_some_and(identity) {
                     continue;
                 }
             }
@@ -100,7 +100,7 @@ impl IssueDetector for MissingInheritanceDetector {
                 if let Some(ASTNode::ContractDefinition(c)) =
                     context.nodes.get(potentially_missing_inheritance)
                 {
-                    if c.kind == ContractKind::Interface || c.is_abstract.map_or(false, identity) {
+                    if c.kind == ContractKind::Interface || c.is_abstract.is_some_and(identity) {
                         // Check that the contract is compatible with the missing inheritance
                         if missing_function_selectors.iter().all(|s| contract_selectors.contains(s))
                         {

diff --git a/aderyn_core/src/detect/low/return_bomb.rs b/aderyn_core/src/detect/low/return_bomb.rs
@@ -130,7 +130,7 @@ struct CallNoAddressChecksTracker<'a> {
     context: &'a WorkspaceContext,
 }
 
-impl<'a> CallGraphVisitor for CallNoAddressChecksTracker<'a> {
+impl CallGraphVisitor for CallNoAddressChecksTracker<'_> {
     fn visit_any(&mut self, node: &crate::context::workspace_context::ASTNode) -> eyre::Result<()> {
         if !self.has_address_checks && helpers::has_binary_checks_on_some_address(node) {
             self.has_address_checks = true;

diff --git a/aderyn_core/src/detect/low/state_variable_could_be_constant.rs b/aderyn_core/src/detect/low/state_variable_could_be_constant.rs
@@ -142,7 +142,7 @@ mod function_state_changes_finder_helper {
         changes: Option<ApproximateStorageChangeFinder<'a>>,
     }
 
-    impl<'a> CallGraphVisitor for StateVariableChangeTracker<'a> {
+    impl CallGraphVisitor for StateVariableChangeTracker<'_> {
         fn visit_any(&mut self, node: &ASTNode) -> eyre::Result<()> {
             let changes = ApproximateStorageChangeFinder::from(self.context, node);
             if self.changes.is_none() {

diff --git a/aderyn_core/src/detect/low/unsafe_oz_erc721_mint.rs b/aderyn_core/src/detect/low/unsafe_oz_erc721_mint.rs
@@ -30,8 +30,7 @@ impl IssueDetector for UnsafeERC721MintDetector {
                 if import_directives.iter().any(|directive| {
                     directive
                         .absolute_path
-                        .as_ref()
-                        .map_or(false, |path| path.contains("openzeppelin"))
+                        .as_ref().is_some_and(|path| path.contains("openzeppelin"))
                 }) && identifier.name == "_mint"
                 {
                     let this_contract_definition = identifier

diff --git a/aderyn_core/src/fscloc/util.rs b/aderyn_core/src/fscloc/util.rs
@@ -50,10 +50,10 @@ impl FromStr for CodeIterator {
     type Err = usize;
 
     fn from_str(code: &str) -> Result<Self, <Self as FromStr>::Err> {
-        return Ok(CodeIterator {
+        Ok(CodeIterator {
             content: code.chars().collect::<Vec<_>>(),
             curr_pos: 0,
             line_no: 1,
-        });
+        })
     }
 }