chore: resolve merge conflicts with main

Author: Tcode-Motion

.jules/bolt.md

@@ -40,7 +40,7 @@ indexmap = { workspace = true }
 bincode = "1.3"
 dirs = "6.0"
 num_cpus = "1.15"
-ureq = { version = "2.9" }
+ureq = { version = "2.9.0" }
 
 [build-dependencies]
 winres = "0.1.12"

Cargo.lock

@@ -14,8 +14,8 @@ impl<'a> Parser<'a> {
         precedence: Precedence,
         reporter: &mut DiagnosticReporter,
     ) -> ParseResult<Expression> {
-        let token = self.advance().clone();
-        let mut left = self.parse_prefix(&token, reporter)?;
+        let token = self.advance();
+        let mut left = self.parse_prefix(token, reporter)?;
 
         while !self.is_at_end() {
             let next_prec = self.peek().kind.precedence();
@@ -41,8 +41,8 @@ impl<'a> Parser<'a> {
                 break;
             }
 
-            let next_token = self.advance().clone();
-            left = self.parse_infix(left, &next_token, reporter)?;
+            let next_token = self.advance();
+            left = self.parse_infix(left, next_token, reporter)?;
         }
 
         Ok(left)

cli/Cargo.toml

@@ -162,15 +162,15 @@ impl<'a> Parser<'a> {
     }
 
     /// Advances the cursor and returns the previous token.
-    pub(crate) fn advance(&mut self) -> &Token {
+    pub(crate) fn advance(&mut self) -> &'a Token {
         if !self.is_at_end() {
             self.pos += 1;
         }
         &self.tokens[self.pos - 1]
     }
 
     /// Returns the previous token.
-    pub(crate) fn previous(&self) -> &Token {
+    pub(crate) fn previous(&self) -> &'a Token {
         &self.tokens[self.pos - 1]
     }
 

compiler/parser/src/expressions.rs

@@ -67,7 +67,7 @@ impl<'a> Parser<'a> {
             || self.check(TokenKind::Send)
         {
             let start_pos = self.peek().span.start;
-            let kw_token = self.peek().clone();
+            let kw_token = self.peek();
             if kw_token.kind == TokenKind::Return {
                 reporter.report(techscript_errors::Diagnostic::new(
                     techscript_errors::DiagnosticLevel::Warning,