chore(linter): Fix some clippy warnings

Author: ngeor

rusty_linter/src/core/type_resolver_impl.rs

@@ -17,7 +17,7 @@ impl Default for TypeResolverImpl {
 
 fn char_to_alphabet_index(ch: char) -> usize {
     let upper = ch.to_ascii_uppercase();
-    if ('A'..='Z').contains(&upper) {
+    if upper.is_ascii_uppercase() {
         ((upper as u8) - b'A') as usize
     } else {
         panic!("Not a latin letter {}", ch)

rusty_linter/src/post_linter/dots_linter.rs

@@ -176,9 +176,8 @@ impl PostConversionLinter for DotsLinter {
         self.ensure_no_dots(&f.variable_name)?;
         self.visit_expression(&f.lower_bound)?;
         self.visit_expression(&f.upper_bound)?;
-        match &f.step {
-            Some(s) => self.visit_expression(s)?,
-            None => (),
+        if let Some(s) = &f.step {
+            self.visit_expression(s)?;
         }
         self.visit_statements(&f.statements)
     }

rusty_linter/src/post_linter/post_conversion_linter.rs

@@ -164,9 +164,8 @@ pub trait PostConversionLinter {
     fn visit_for_loop(&mut self, f: &ForLoop) -> Result<(), LintErrorPos> {
         self.visit_expression(&f.lower_bound)?;
         self.visit_expression(&f.upper_bound)?;
-        match &f.step {
-            Some(s) => self.visit_expression(s)?,
-            None => (),
+        if let Some(s) = &f.step {
+            self.visit_expression(s)?;
         }
         self.visit_statements(&f.statements)
     }
@@ -239,10 +238,9 @@ pub trait PostConversionLinter {
     }
 
     fn visit_print(&mut self, print: &Print) -> Result<(), LintErrorPos> {
-        match &print.format_string {
-            Some(f) => self.visit_expression(f)?,
-            None => {}
-        };
+        if let Some(f) = &print.format_string {
+            self.visit_expression(f)?;
+        }
         for print_arg in &print.args {
             if let PrintArg::Expression(e) = print_arg {
                 self.visit_expression(e)?;

rusty_linter/src/post_linter/print_linter.rs

@@ -25,10 +25,10 @@ impl Visitor<Statement> for PrintLinter {
 
 impl Visitor<Print> for PrintLinter {
     fn visit(&mut self, print: &Print) -> VisitResult {
-        if let Some(f) = &print.format_string {
-            if f.expression_type() != ExpressionType::BuiltIn(TypeQualifier::DollarString) {
-                return Err(LintError::TypeMismatch.at(f));
-            }
+        if let Some(f) = &print.format_string
+            && f.expression_type() != ExpressionType::BuiltIn(TypeQualifier::DollarString)
+        {
+            return Err(LintError::TypeMismatch.at(f));
         }
         for print_arg in &print.args {
             if let PrintArg::Expression(expr_pos) = print_arg {

rusty_linter/src/pre_linter/sub_program_context.rs

@@ -1,3 +1,5 @@
+use std::collections::hash_map;
+
 use rusty_common::*;
 use rusty_parser::BareName;
 
@@ -76,7 +78,6 @@ impl Declarations {
             if !exists {
                 self.0.insert(bare_name, signature);
             }
-            ()
         })
     }
 
@@ -92,11 +93,11 @@ impl Implementations {
         signature: Positioned<Signature>,
     ) -> Result<(), LintErrorPos> {
         // add if doesn't already exist, do not tolerate multiple implementations
-        if self.0.contains_key(&bare_name) {
-            Err(LintError::DuplicateDefinition.at_pos(signature.pos))
-        } else {
-            self.0.insert(bare_name, signature);
+        if let hash_map::Entry::Vacant(e) = self.0.entry(bare_name) {
+            e.insert(signature);
             Ok(())
+        } else {
+            Err(LintError::DuplicateDefinition.at_pos(signature.pos))
         }
     }
 

rusty_parser/src/core/expression.rs

@@ -809,8 +809,11 @@ mod variable {
 
     fn map_to_property(name_as_tokens: NameAsTokens) -> Expression {
         let (name_token, opt_q_token) = name_as_tokens;
-        let mut property_names: VecDeque<String> =
-            name_token.as_str().split('.').map(|s| s.to_owned()).collect();
+        let mut property_names: VecDeque<String> = name_token
+            .as_str()
+            .split('.')
+            .map(|s| s.to_owned())
+            .collect();
         let mut result = Expression::Variable(
             Name::bare(BareName::new(property_names.pop_front().unwrap())),
             VariableInfo::unresolved(),