Clippy-related cleanup

camden-smallwood · Dec 14, 2022 · 2c79a43 · 2c79a43
1 parent df10dbd
commit 2c79a43
Show file tree

Hide file tree

Showing 53 changed files with 277 additions and 347 deletions.
diff --git a/solast/src/analysis/abi_encoding.rs b/solast/src/analysis/abi_encoding.rs
@@ -82,7 +82,7 @@ impl AstVisitor for AbiEncodingVisitor {
                     function_definition.visibility,
 
                     if let FunctionKind::Constructor = function_definition.kind {
-                        format!("{}", "constructor")
+                        "constructor".to_string()
                     } else {
                         format!("`{}` {}", function_definition.name, function_definition.kind)
                     },

diff --git a/solast/src/analysis/assert_usage.rs b/solast/src/analysis/assert_usage.rs
@@ -15,7 +15,7 @@ impl AstVisitor for AssertUsageVisitor {
 
         let definition_id = match context.definition_node {
             ContractDefinitionNode::FunctionDefinition(FunctionDefinition { id, .. }) |
-            ContractDefinitionNode::ModifierDefinition(ModifierDefinition { id, .. }) => id.clone(),
+            ContractDefinitionNode::ModifierDefinition(ModifierDefinition { id, .. }) => *id,
 
             _ => return Ok(())
         };
@@ -56,7 +56,7 @@ impl AstVisitor for AssertUsageVisitor {
                 function_definition.visibility,
 
                 if let FunctionKind::Constructor = function_definition.kind {
-                    format!("{}", "constructor")
+                    "constructor".to_string()
                 } else {
                     format!("`{}` {}", function_definition.name, function_definition.kind)
                 },

diff --git a/solast/src/analysis/check_effects_interactions.rs b/solast/src/analysis/check_effects_interactions.rs
@@ -60,9 +60,7 @@ impl CheckEffectsInteractionsVisitor {
                     }
                 }
 
-                if state_variable_id.is_none() {
-                    return None
-                }
+                state_variable_id?;
             }
 
             state_variable_id
@@ -169,57 +167,49 @@ impl CheckEffectsInteractionsVisitor {
 
 impl AstVisitor for CheckEffectsInteractionsVisitor {
     fn visit_contract_definition<'a>(&mut self, context: &mut ContractDefinitionContext<'a>) -> io::Result<()> {
-        if !self.contract_info.contains_key(&context.contract_definition.id) {
-            self.contract_info.insert(context.contract_definition.id, ContractInfo {
-                function_info: HashMap::new(),
-            });
-        }
+        self.contract_info.entry(context.contract_definition.id).or_insert_with(|| ContractInfo {
+            function_info: HashMap::new(),
+        });
 
         Ok(())
     }
 
     fn visit_function_definition<'a>(&mut self, context: &mut FunctionDefinitionContext<'a>) -> io::Result<()> {
         let contract_info = self.contract_info.get_mut(&context.contract_definition.id).unwrap();
 
-        if !contract_info.function_info.contains_key(&context.function_definition.id) {
-            contract_info.function_info.insert(context.function_definition.id, FunctionInfo {
-                block_info: HashMap::new(),
-            });
-        }
+        contract_info.function_info.entry(context.function_definition.id).or_insert_with(|| FunctionInfo {
+            block_info: HashMap::new(),
+        });
 
         Ok(())
     }
 
     fn visit_modifier_definition<'a>(&mut self, context: &mut ModifierDefinitionContext<'a>) -> io::Result<()> {
         let contract_info = self.contract_info.get_mut(&context.contract_definition.id).unwrap();
 
-        if !contract_info.function_info.contains_key(&context.modifier_definition.id) {
-            contract_info.function_info.insert(context.modifier_definition.id, FunctionInfo {
-                block_info: HashMap::new(),
-            });
-        }
+        contract_info.function_info.entry(context.modifier_definition.id).or_insert_with(|| FunctionInfo {
+            block_info: HashMap::new(),
+        });
 
         Ok(())
     }
 
     fn visit_block<'a, 'b>(&mut self, context: &mut BlockContext<'a, 'b>) -> io::Result<()> {
         let definition_id = match context.definition_node {
-            &ContractDefinitionNode::FunctionDefinition(FunctionDefinition { id, .. }) => id,
-            &ContractDefinitionNode::ModifierDefinition(ModifierDefinition { id, .. }) => id,
+            ContractDefinitionNode::FunctionDefinition(FunctionDefinition { id, .. }) => id,
+            ContractDefinitionNode::ModifierDefinition(ModifierDefinition { id, .. }) => id,
             _ => return Ok(())
         };
 
         let contract_info = self.contract_info.get_mut(&context.contract_definition.id).unwrap();
-        let function_info = contract_info.function_info.get_mut(&definition_id).unwrap();
+        let function_info = contract_info.function_info.get_mut(definition_id).unwrap();
 
-        if !function_info.block_info.contains_key(&context.block.id) {
-            function_info.block_info.insert(context.block.id, BlockInfo {
-                makes_external_call: false,
-                makes_post_external_call_assignment: false,
-                variable_bindings: HashMap::new(),
-                parent_blocks: context.blocks.iter().map(|&block| block.id).collect(),
-            });
-        }
+        function_info.block_info.entry(context.block.id).or_insert_with(|| BlockInfo {
+            makes_external_call: false,
+            makes_post_external_call_assignment: false,
+            variable_bindings: HashMap::new(),
+            parent_blocks: context.blocks.iter().map(|&block| block.id).collect(),
+        });
 
         Ok(())
     }
@@ -230,13 +220,13 @@ impl AstVisitor for CheckEffectsInteractionsVisitor {
         }
 
         let definition_id = match context.definition_node {
-            &ContractDefinitionNode::FunctionDefinition(FunctionDefinition { id, .. }) => id,
-            &ContractDefinitionNode::ModifierDefinition(ModifierDefinition { id, .. }) => id,
+            ContractDefinitionNode::FunctionDefinition(FunctionDefinition { id, .. }) => id,
+            ContractDefinitionNode::ModifierDefinition(ModifierDefinition { id, .. }) => id,
             _ => return Ok(())
         };
 
         let contract_info = self.contract_info.get_mut(&context.contract_definition.id).unwrap();
-        let function_info = contract_info.function_info.get_mut(&definition_id).unwrap();
+        let function_info = contract_info.function_info.get_mut(definition_id).unwrap();
         let block_id = context.blocks.last().unwrap().id;
 
         //
@@ -270,11 +260,7 @@ impl AstVisitor for CheckEffectsInteractionsVisitor {
 
                 let block_info = function_info.block_info.get_mut(&block_id).unwrap();
 
-                if !block_info.variable_bindings.contains_key(&state_variable_id) {
-                    block_info.variable_bindings.insert(state_variable_id, vec![]);
-                }
-
-                let variable_bindings = block_info.variable_bindings.get_mut(&state_variable_id).unwrap();
+                let variable_bindings = block_info.variable_bindings.entry(state_variable_id).or_insert_with(Vec::new);
 
                 if !variable_bindings.contains(&local_variable_id) {
                     variable_bindings.push(local_variable_id);
@@ -294,7 +280,7 @@ impl AstVisitor for CheckEffectsInteractionsVisitor {
                         _ => continue
                     };
 
-                    let local_variable_id = match context.variable_declaration_statement.declarations.iter().nth(i).unwrap() {
+                    let local_variable_id = match context.variable_declaration_statement.declarations.get(i).unwrap() {
                         &Some(VariableDeclaration {
                             storage_location: StorageLocation::Storage,
                             id,
@@ -317,11 +303,7 @@ impl AstVisitor for CheckEffectsInteractionsVisitor {
 
                     let block_info = function_info.block_info.get_mut(&block_id).unwrap();
 
-                    if !block_info.variable_bindings.contains_key(&state_variable_id) {
-                        block_info.variable_bindings.insert(state_variable_id, vec![]);
-                    }
-
-                    let variable_bindings = block_info.variable_bindings.get_mut(&state_variable_id).unwrap();
+                    let variable_bindings = block_info.variable_bindings.entry(state_variable_id).or_insert_with(Vec::new);
 
                     if !variable_bindings.contains(&local_variable_id) {
                         variable_bindings.push(local_variable_id);
@@ -341,13 +323,13 @@ impl AstVisitor for CheckEffectsInteractionsVisitor {
         }
 
         let definition_id = match context.definition_node {
-            &ContractDefinitionNode::FunctionDefinition(FunctionDefinition { id, .. }) => id,
-            &ContractDefinitionNode::ModifierDefinition(ModifierDefinition { id, .. }) => id,
+            ContractDefinitionNode::FunctionDefinition(FunctionDefinition { id, .. }) => id,
+            ContractDefinitionNode::ModifierDefinition(ModifierDefinition { id, .. }) => id,
             _ => return Ok(())
         };
 
         let contract_info = self.contract_info.get_mut(&context.contract_definition.id).unwrap();
-        let function_info = contract_info.function_info.get_mut(&definition_id).unwrap();
+        let function_info = contract_info.function_info.get_mut(definition_id).unwrap();
         let block_info = function_info.block_info.get_mut(&context.blocks.last().unwrap().id).unwrap();
 
         //
@@ -381,13 +363,13 @@ impl AstVisitor for CheckEffectsInteractionsVisitor {
         }
 
         let definition_id = match context.definition_node {
-            &ContractDefinitionNode::FunctionDefinition(FunctionDefinition { id, .. }) => id,
-            &ContractDefinitionNode::ModifierDefinition(ModifierDefinition { id, .. }) => id,
+            ContractDefinitionNode::FunctionDefinition(FunctionDefinition { id, .. }) => id,
+            ContractDefinitionNode::ModifierDefinition(ModifierDefinition { id, .. }) => id,
             _ => return Ok(())
         };
 
         let contract_info = self.contract_info.get_mut(&context.contract_definition.id).unwrap();
-        let function_info = contract_info.function_info.get_mut(&definition_id).unwrap();
+        let function_info = contract_info.function_info.get_mut(definition_id).unwrap();
         let block_info = function_info.block_info.get_mut(&context.blocks.last().unwrap().id).unwrap();
 
         //

diff --git a/solast/src/analysis/explicit_variable_return.rs b/solast/src/analysis/explicit_variable_return.rs
@@ -25,7 +25,7 @@ impl ExplicitVariableReturnVisitor {
                 function_definition.visibility,
 
                 if let FunctionKind::Constructor = function_definition.kind {
-                    format!("{}", "constructor")
+                    "constructor".to_string()
                 } else {
                     format!("`{}` {}", function_definition.name, function_definition.kind)
                 },
@@ -60,11 +60,9 @@ impl ExplicitVariableReturnVisitor {
 
 impl AstVisitor for ExplicitVariableReturnVisitor {
     fn visit_variable_declaration_statement<'a, 'b>(&mut self, context: &mut VariableDeclarationStatementContext<'a, 'b>) -> io::Result<()> {
-        for declaration in context.variable_declaration_statement.declarations.iter() {
-            if let Some(declaration) = declaration {
-                if !self.local_variable_ids.contains(&declaration.id) {
-                    self.local_variable_ids.insert(declaration.id);
-                }
+        for declaration in context.variable_declaration_statement.declarations.iter().flatten() {
+            if !self.local_variable_ids.contains(&declaration.id) {
+                self.local_variable_ids.insert(declaration.id);
             }
         }
 
@@ -88,17 +86,15 @@ impl AstVisitor for ExplicitVariableReturnVisitor {
             Some(Expression::TupleExpression(tuple_expression)) => {
                 let mut all_local_variables = true;
 
-                for component in tuple_expression.components.iter() {
-                    if let Some(component) = component {
-                        if let Expression::Identifier(identifier) = component {
-                            if !self.local_variable_ids.contains(&identifier.referenced_declaration) {
-                                all_local_variables = false;
-                                break;
-                            }
-                        } else {
+                for component in tuple_expression.components.iter().flatten() {
+                    if let Expression::Identifier(identifier) = component {
+                        if !self.local_variable_ids.contains(&identifier.referenced_declaration) {
                             all_local_variables = false;
                             break;
                         }
+                    } else {
+                        all_local_variables = false;
+                        break;
                     }
                 }
 

diff --git a/solast/src/analysis/external_calls_in_loop.rs b/solast/src/analysis/external_calls_in_loop.rs
@@ -25,7 +25,7 @@ impl ExternalCallsInLoopVisitor {
                 function_definition.visibility,
 
                 if let FunctionKind::Constructor = function_definition.kind {
-                    format!("{}", "constructor")
+                    "constructor".to_string()
                 } else {
                     format!("`{}` {}", function_definition.name, function_definition.kind)
                 },

diff --git a/solast/src/analysis/ineffectual_statements.rs b/solast/src/analysis/ineffectual_statements.rs
@@ -21,7 +21,7 @@ impl IneffectualStatementsVisitor {
                 function_definition.visibility,
 
                 if let FunctionKind::Constructor = function_definition.kind {
-                    format!("{}", "constructor")
+                    "constructor".to_string()
                 } else {
                     format!("`{}` {}", function_definition.name, function_definition.kind)
                 },

diff --git a/solast/src/analysis/inline_assembly.rs b/solast/src/analysis/inline_assembly.rs
@@ -21,7 +21,7 @@ impl InlineAssemblyVisitor {
                 function_definition.visibility,
 
                 if let FunctionKind::Constructor = function_definition.kind {
-                    format!("{}", "constructor")
+                    "constructor".to_string()
                 } else {
                     format!("`{}` {}", function_definition.name, function_definition.kind)
                 },
@@ -95,7 +95,7 @@ impl AstVisitor for InlineAssemblyVisitor {
             }
 
             "calldatacopy" => {
-                let arguments = match context.yul_function_call.arguments.iter().nth(2) {
+                let arguments = match context.yul_function_call.arguments.get(2) {
                     Some(YulExpression::YulFunctionCall(YulFunctionCall {
                         function_name: YulIdentifier { name },
                         arguments,
@@ -104,7 +104,7 @@ impl AstVisitor for InlineAssemblyVisitor {
                     _ => return Ok(())
                 };
 
-                match arguments.iter().nth(0) {
+                match arguments.get(0) {
                     Some(YulExpression::YulFunctionCall(YulFunctionCall {
                         function_name: YulIdentifier { name },
                         ..
@@ -113,7 +113,7 @@ impl AstVisitor for InlineAssemblyVisitor {
                     _ => return Ok(())
                 }
 
-                let value = match arguments.iter().nth(1) {
+                let value = match arguments.get(1) {
                     Some(
                         YulExpression::YulLiteral(YulLiteral {
                             value: Some(value),

diff --git a/solast/src/analysis/large_literals.rs b/solast/src/analysis/large_literals.rs
@@ -20,7 +20,7 @@ impl LargeLiteralsVisitor {
                 function_definition.visibility,
 
                 if let FunctionKind::Constructor = function_definition.kind {
-                    format!("{}", "constructor")
+                    "constructor".to_string()
                 } else {
                     format!("`{}` {}", function_definition.name, function_definition.kind)
                 },
@@ -52,7 +52,9 @@ impl LargeLiteralsVisitor {
 impl AstVisitor for LargeLiteralsVisitor {
     fn visit_literal<'a, 'b>(&mut self, context: &mut LiteralContext<'a, 'b>) -> io::Result<()> {
         if let Some(value) = context.literal.value.as_ref() {
-            if value.chars().all(char::is_numeric) && (|n| (n > 6) && ((n % 3) != 0))(value.len()) {
+            let n = value.len();
+
+            if value.chars().all(char::is_numeric) && (n > 6) && ((n % 3) != 0) {
                 self.print_message(
                     context.contract_definition,
                     context.definition_node,

diff --git a/solast/src/analysis/manipulatable_balance_usage.rs b/solast/src/analysis/manipulatable_balance_usage.rs
@@ -26,7 +26,7 @@ impl ManipulatableBalanceUsageVisitor {
                 function_definition.visibility,
 
                 if let FunctionKind::Constructor = function_definition.kind {
-                    format!("{}", "constructor")
+                    "constructor".to_string()
                 } else {
                     format!("`{}` {}", function_definition.name, function_definition.kind)
                 },

diff --git a/solast/src/analysis/missing_return.rs b/solast/src/analysis/missing_return.rs
@@ -26,7 +26,7 @@ impl MissingReturnVisitor {
             function_definition.visibility,
 
             if let FunctionKind::Constructor = function_definition.kind {
-                format!("{}", "constructor")
+                "constructor".to_string()
             } else {
                 format!("`{}` {}", function_definition.name, function_definition.kind)
             },
@@ -47,14 +47,9 @@ impl AstVisitor for MissingReturnVisitor {
             return Ok(());
         }
 
-        if !self.function_info.contains_key(&context.function_definition.id) {
-            self.function_info.insert(
-                context.function_definition.id,
-                FunctionInfo {
-                    assigned_return_variables: HashSet::new(),
-                },
-            );
-        }
+        self.function_info.entry(context.function_definition.id).or_insert_with(|| FunctionInfo {
+            assigned_return_variables: HashSet::new(),
+        });
 
         Ok(())
     }

diff --git a/solast/src/analysis/redundant_assignments.rs b/solast/src/analysis/redundant_assignments.rs
@@ -26,7 +26,7 @@ impl RedundantAssignmentsVisitor {
                 function_definition.visibility,
 
                 if let FunctionKind::Constructor = function_definition.kind {
-                    format!("{}", "constructor")
+                    "constructor".to_string()
                 } else {
                     format!("`{}` {}", function_definition.name, function_definition.kind)
                 },
@@ -67,7 +67,7 @@ impl AstVisitor for RedundantAssignmentsVisitor {
                     component_ids.extend(component.referenced_declarations());
                 }
 
-                if !component_ids.is_empty() && tuple_component_ids.iter().find(|&ids| ids.eq(&component_ids)).is_some() {
+                if !component_ids.is_empty() && tuple_component_ids.iter().any(|ids| ids.eq(&component_ids)) {
                     self.print_message(
                         context.contract_definition,
                         context.definition_node,

diff --git a/solast/src/analysis/redundant_comparisons.rs b/solast/src/analysis/redundant_comparisons.rs
@@ -21,7 +21,7 @@ impl RedundantComparisonsVisitor {
                 function_definition.visibility,
 
                 if let FunctionKind::Constructor = function_definition.kind {
-                    format!("{}", "constructor")
+                    "constructor".to_string()
                 } else {
                     format!("`{}` {}", function_definition.name, function_definition.kind)
                 },

diff --git a/solast/src/analysis/redundant_imports.rs b/solast/src/analysis/redundant_imports.rs
@@ -13,11 +13,9 @@ pub struct RedundantImportsVisitor {
 
 impl AstVisitor for RedundantImportsVisitor {
     fn visit_source_unit<'a>(&mut self, context: &mut SourceUnitContext<'a>) -> std::io::Result<()> {
-        if !self.source_unit_info.contains_key(&context.current_source_unit.id) {
-            self.source_unit_info.insert(context.current_source_unit.id, SourceUnitInfo {
-                imported_paths: HashMap::new(),
-            });
-        }
+        self.source_unit_info.entry(context.current_source_unit.id).or_insert_with(|| SourceUnitInfo {
+            imported_paths: HashMap::new(),
+        });
 
         Ok(())
     }