From 725ccebc91786e001b5f997c7579d8555d1b592f Mon Sep 17 00:00:00 2001
From: Garrit Franke <garrit@slashdev.space>
Date: Sat, 20 Feb 2021 14:26:37 +0100
Subject: [PATCH] chore: fix clippy warnings

---
 src/parser/rules.rs | 42 +++++++++++++++---------------------------
 src/util/mod.rs     |  1 +
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/parser/rules.rs b/src/parser/rules.rs
index 9831548..4334764 100644
--- a/src/parser/rules.rs
+++ b/src/parser/rules.rs
@@ -271,32 +271,21 @@ impl Parser {
                 self.match_token(TokenKind::BraceClose)?;
                 expr
             }
-            TokenKind::Keyword(Keyword::Boolean) => {
-                let state = match BinOp::try_from(self.peek()?.kind) {
-                    Ok(_) => self.parse_bin_op(None)?,
-                    Err(_) => {
-                        Expression::Bool(token.raw.parse::<bool>().map_err(|e| e.to_string())?)
-                    }
-                };
-                state
-            }
-            TokenKind::Literal(Value::Int) => {
-                let state = match BinOp::try_from(self.peek()?.kind) {
-                    Ok(_) => self.parse_bin_op(None)?,
-                    Err(_) => Expression::Int(token.raw.parse::<u32>().map_err(|e| e.to_string())?),
-                };
-                state
-            }
-            TokenKind::Literal(Value::Str) => {
-                let state = match BinOp::try_from(self.peek()?.kind) {
-                    Ok(_) => self.parse_bin_op(None)?,
-                    Err(_) => Expression::Str(token.raw),
-                };
-                state
-            }
+            TokenKind::Keyword(Keyword::Boolean) => match BinOp::try_from(self.peek()?.kind) {
+                Ok(_) => self.parse_bin_op(None)?,
+                Err(_) => Expression::Bool(token.raw.parse::<bool>().map_err(|e| e.to_string())?),
+            },
+            TokenKind::Literal(Value::Int) => match BinOp::try_from(self.peek()?.kind) {
+                Ok(_) => self.parse_bin_op(None)?,
+                Err(_) => Expression::Int(token.raw.parse::<u32>().map_err(|e| e.to_string())?),
+            },
+            TokenKind::Literal(Value::Str) => match BinOp::try_from(self.peek()?.kind) {
+                Ok(_) => self.parse_bin_op(None)?,
+                Err(_) => Expression::Str(token.raw),
+            },
             TokenKind::Identifier(val) => {
                 let next = self.peek()?;
-                let state = match &next.kind {
+                match &next.kind {
                     TokenKind::BraceOpen => {
                         let func_call = self.parse_function_call(Some(val))?;
                         match BinOp::try_from(self.peek()?.kind) {
@@ -323,12 +312,11 @@ impl Parser {
                         Ok(_) => self.parse_bin_op(Some(Expression::Variable(token.raw)))?,
                         Err(_) => Expression::Variable(val),
                     },
-                };
-                state
+                }
             }
             TokenKind::SquareBraceOpen => self.parse_array()?,
             TokenKind::Keyword(Keyword::New) => self.parse_struct_initialization()?,
-            other => Err(format!("Expected Expression, found {:?}", other))?,
+            other => return Err(format!("Expected Expression, found {:?}", other)),
         };
 
         if self.peek_token(TokenKind::Dot).is_ok() {
diff --git a/src/util/mod.rs b/src/util/mod.rs
index 9a7561a..d2ec59c 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -15,6 +15,7 @@
  */
 pub mod string_util;
 
+#[cfg(feature = "backend_c")]
 /// Datatype that holds one of two types
 pub enum Either<L, R> {
     Left(L),