wip

Author: Jon-Becker

crates/common/src/ether/tokenize.rs

@@ -9,7 +9,7 @@ pub enum Token {
 }
 
 impl Display for Token {
-    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
             Token::Literal(literal) => write!(f, "{}", literal),
             Token::Variable(variable) => write!(f, "{}", variable),
@@ -130,17 +130,17 @@ pub fn tokenize(s: &str) -> Token {
                 let mut op = ch.to_string();
                 iter.next();
                 if let Some(&next_ch) = iter.peek() {
-                    if (ch == '=' && (next_ch == '=' || next_ch == '>')) ||
-                        (ch == '&' && next_ch == '&') ||
-                        (ch == '|' && next_ch == '|') ||
-                        (ch == '<' && next_ch == '=') ||
-                        (ch == '>' && next_ch == '=') ||
-                        (ch == '!' && next_ch == '=') ||
-                        (ch == '+' && next_ch == '+') ||
-                        (ch == '-' && next_ch == '-') ||
-                        (ch == '*' && next_ch == '*') ||
-                        (ch == '>' && next_ch == '>') ||
-                        (ch == '<' && next_ch == '<')
+                    if (ch == '=' && (next_ch == '=' || next_ch == '>'))
+                        || (ch == '&' && next_ch == '&')
+                        || (ch == '|' && next_ch == '|')
+                        || (ch == '<' && next_ch == '=')
+                        || (ch == '>' && next_ch == '=')
+                        || (ch == '!' && next_ch == '=')
+                        || (ch == '+' && next_ch == '+')
+                        || (ch == '-' && next_ch == '-')
+                        || (ch == '*' && next_ch == '*')
+                        || (ch == '>' && next_ch == '>')
+                        || (ch == '<' && next_ch == '<')
                     {
                         op.push(next_ch);
                         iter.next();
@@ -174,7 +174,7 @@ pub fn tokenize(s: &str) -> Token {
     Token::Expression(tokens)
 }
 
-fn parse_literal(iter: &mut std::iter::Peekable<std::str::Chars>) -> String {
+fn parse_literal(iter: &mut std::iter::Peekable<std::str::Chars<'_>>) -> String {
     let mut literal = String::new();
 
     while let Some(&ch) = iter.peek() {
@@ -188,9 +188,9 @@ fn parse_literal(iter: &mut std::iter::Peekable<std::str::Chars>) -> String {
     }
 
     // literal validation
-    if literal.starts_with("0x") &&
-        literal.len() > 2 &&
-        literal[2..].chars().all(|c| c.is_ascii_hexdigit())
+    if literal.starts_with("0x")
+        && literal.len() > 2
+        && literal[2..].chars().all(|c| c.is_ascii_hexdigit())
     {
         return literal;
     }
@@ -200,7 +200,7 @@ fn parse_literal(iter: &mut std::iter::Peekable<std::str::Chars>) -> String {
     String::from("0")
 }
 
-fn parse_variable(iter: &mut std::iter::Peekable<std::str::Chars>) -> String {
+fn parse_variable(iter: &mut std::iter::Peekable<std::str::Chars<'_>>) -> String {
     let mut variable = String::new();
     while let Some(&ch) = iter.peek() {
         match ch {
@@ -214,7 +214,7 @@ fn parse_variable(iter: &mut std::iter::Peekable<std::str::Chars>) -> String {
     variable
 }
 
-fn consume_parentheses(iter: &mut std::iter::Peekable<std::str::Chars>) -> String {
+fn consume_parentheses(iter: &mut std::iter::Peekable<std::str::Chars<'_>>) -> String {
     let mut expression = String::new();
     let mut parentheses_count = 1;
 

crates/common/src/lib.rs

@@ -1,5 +1,3 @@
-extern crate lazy_static;
-
 pub mod constants;
 pub mod ether;
 pub mod resources;