From aa29b1152569c25f6b685191e2956be1b38269c8 Mon Sep 17 00:00:00 2001
From: core <core@coredoes.dev>
Date: Fri, 28 Mar 2025 09:25:23 -0400
Subject: [PATCH] more cleanup

---
 crates/client/src/rendering/assets.rs | 1 -
 crates/client/src/rendering/mod.rs    | 2 +-
 crates/kabel/src/macros.rs            | 2 +-
 crates/kabel/src/name_resolution.rs   | 2 --
 crates/kabel/src/parser.rs            | 5 ++---
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/crates/client/src/rendering/assets.rs b/crates/client/src/rendering/assets.rs
index 445a7577d7ed57d34fe6fdafaf2e39bc10174bf0..b4380dbc5d066a873546933e33e65ea06450e9b0 100644
--- a/crates/client/src/rendering/assets.rs
+++ b/crates/client/src/rendering/assets.rs
@@ -1,5 +1,4 @@
 use std::fmt::Display;
-use std::fmt::Write;
 
 #[derive(Debug, Clone)]
 pub enum AssetError {
diff --git a/crates/client/src/rendering/mod.rs b/crates/client/src/rendering/mod.rs
index 39b73770129d87237a32c02247c52c105363208f..b2cea7351a0fad8e171b4719e67cd057297eca8c 100644
--- a/crates/client/src/rendering/mod.rs
+++ b/crates/client/src/rendering/mod.rs
@@ -472,7 +472,7 @@ impl ApplicationHandler for App {
         }
     }
     fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
-        let ws = self
+        let mut ws = self
             .world
             .get_resource_mut::<Ws>()
             .expect("Failed to get Ws resource");
diff --git a/crates/kabel/src/macros.rs b/crates/kabel/src/macros.rs
index a9303093f84998ca93508667e1e43026d359dbc7..bbc504b45fa566d88f9831aa8895668f41322ea7 100644
--- a/crates/kabel/src/macros.rs
+++ b/crates/kabel/src/macros.rs
@@ -1,7 +1,7 @@
 #[macro_export]
 macro_rules! token {
     ($self:expr, $token:expr) => {
-        crate::lexer::Token {
+        $crate::lexer::Token {
             token_type: $token,
             start_column: $self.start,
             end_column: $self.line_current,
diff --git a/crates/kabel/src/name_resolution.rs b/crates/kabel/src/name_resolution.rs
index 750733d2c88ec3df2e84bea7fba58925938743c2..cfaaf080c89ecaf605725f1b8919b0ebe53dd7dc 100644
--- a/crates/kabel/src/name_resolution.rs
+++ b/crates/kabel/src/name_resolution.rs
@@ -69,7 +69,6 @@ impl Resolver {
                                     ErrorKind::FunctionAlreadyDeclaredFunction, ast,
                                     "Function \"{}\" already declared", name ;
                                     "hint: has function \"{}\" already been declared?", name.name));
-                        } else {
                         }
                     }
                 }
@@ -270,7 +269,6 @@ impl Resolver {
                                     ErrorKind::VariableAlreadyDeclaredFunction, ast,
                                     "Variable \"{}\" already declared", name ;
                                     "hint: has function \"{}\" already been declared?", name.name));
-                        } else {
                         }
                     }
                 }
diff --git a/crates/kabel/src/parser.rs b/crates/kabel/src/parser.rs
index dc586f455d264a796ad8824224c5dfe0cc6e0117..105885b229ab881f4cd5182ab302b6b340408380 100644
--- a/crates/kabel/src/parser.rs
+++ b/crates/kabel/src/parser.rs
@@ -200,8 +200,7 @@ impl Parser {
             let expression1;
             if let TokenType::Semicolon = self.peek()?.token_type {
                 expression1 = None;
-            } else {
-                if let TokenType::Var = self.peek()?.token_type {
+            } else if let TokenType::Var = self.peek()?.token_type {
                     expression1 = Some(self.declaration()?);
                 } else {
                     expression1 = Some(self.expression()?);
@@ -216,7 +215,7 @@ impl Parser {
                         ));
                     }
                 }
-            }
+
             let expression2;
             if let TokenType::Semicolon = self.peek()?.token_type {
                 expression2 = None;