♻️ fix clippy and fmt issues

KPMGE · Mar 11, 2024 · 5ef4282 · 5ef4282
1 parent 91c7d64
commit 5ef4282
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/src/evaluator.rs b/src/evaluator.rs
@@ -1,5 +1,7 @@
 use crate::ast::{AstNode, Expression};
 use crate::token::Token;
+
+#[derive(Default)]
 pub struct Evaluator {}
 
 #[derive(Debug, PartialEq)]
@@ -11,7 +13,7 @@ pub enum Object {
 
 impl Evaluator {
     pub fn new() -> Self {
-        Evaluator {}
+        Evaluator::default()
     }
 
     pub fn eval(&self, node: AstNode) -> Object {
@@ -121,7 +123,7 @@ impl Object {
         match self {
             Object::Integer(value) => format!("{value}"),
             Object::Boolean(value) => format!("{value}"),
-            Object::Null => format!("null"),
+            Object::Null => "null".to_string(),
         }
     }
 

diff --git a/src/lexer.rs b/src/lexer.rs
@@ -151,10 +151,6 @@ trait IsLetter {
 
 impl IsLetter for char {
     fn is_letter(&self) -> bool {
-        ('a'..='z').contains(self) || ('A'..='Z').contains(self)
-        // match *self {
-        //     'a' .. 'z' | 'A' .. 'Z' => true,
-        //     _ => false
-        // }
+        self.is_ascii_lowercase() || self.is_ascii_uppercase()
     }
 }
diff --git a/src/parser.rs b/src/parser.rs
@@ -129,14 +129,13 @@ impl Parser {
         let prefix_parse_fn = self.current_token.prefix_parse_fn()?;
         let left_expression = prefix_parse_fn(self)?;
 
-        let is_next_token_precedence_higher = precedence <= self.next_token.precedence();
+        let is_next_token_precedence_higher = precedence < self.next_token.precedence();
 
         while !self.expect_current_token(Token::Semicolon) && is_next_token_precedence_higher {
             if let Some(infix_parse_fn) = self.next_token.get_infix_parse_fn() {
                 self.advance_tokens();
                 return infix_parse_fn(self, left_expression);
             }
-            break;
         }
 
         Some(left_expression)
@@ -399,7 +398,7 @@ impl Parser {
     }
 
     fn report_error(&mut self, message: &str) {
-        self.errors.push(format!("{}", message))
+        self.errors.push(message.to_string())
     }
 }
 

diff --git a/tests/evaluator.rs b/tests/evaluator.rs
@@ -15,7 +15,7 @@ fn given_an_integer_expression_it_should_evaluate_to_the_right_object() {
             _ => panic!("Unexpected AstNode!"),
         };
 
-        let evaluator = Evaluator {};
+        let evaluator = Evaluator::new();
         let evaluated_obj = evaluator.eval(node);
 
         assert_eq!(evaluated_obj, *expected_objects.get(idx).unwrap());
@@ -36,7 +36,7 @@ fn given_boolean_expressions_it_should_evaluate_to_the_right_object() {
             _ => panic!("Unexpected AstNode!"),
         };
 
-        let evaluator = Evaluator {};
+        let evaluator = Evaluator::new();
         let evaluated_obj = evaluator.eval(node);
 
         assert_eq!(evaluated_obj, *expected_objects.get(idx).unwrap());
@@ -63,7 +63,7 @@ fn given_prefix_expressions_it_should_evaluate_correctly() {
             _ => panic!("Unexpected AstNode!"),
         };
 
-        let evaluator = Evaluator {};
+        let evaluator = Evaluator::new();
         let evaluated_obj = evaluator.eval(node);
 
         assert_eq!(evaluated_obj, *expected_objects.get(idx).unwrap());
@@ -98,7 +98,7 @@ fn given_if_else_expressions_it_should_evaluate_correctly() {
             _ => panic!("Unexpected AstNode!"),
         };
 
-        let evaluator = Evaluator {};
+        let evaluator = Evaluator::new();
         let evaluated_obj = evaluator.eval(node);
 
         assert_eq!(evaluated_obj, *expected_objects.get(idx).unwrap());