5 files changed, 4 insertions(+), 8 deletions(-)

M crates/client/src/rendering/assets.rs
M crates/client/src/rendering/mod.rs
M crates/kabel/src/macros.rs
M crates/kabel/src/name_resolution.rs
M crates/kabel/src/parser.rs

@@ 1,5 1,4 @@
 use std::fmt::Display;
-use std::fmt::Write;
 
 #[derive(Debug, Clone)]
 pub enum AssetError {

@@ 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");

@@ 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,

@@ 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 {
                         }
                     }
                 }

@@ 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;