From b7573dd79d1e7390223acaa63b6379993564080b Mon Sep 17 00:00:00 2001
From: Noa <coolreader18@gmail.com>
Date: Thu, 15 May 2025 13:01:00 -0500
Subject: [PATCH] Fix warnings for rust 1.87

---
 jit/src/instructions.rs | 3 +--
 jit/src/lib.rs          | 8 +++++++-
 jit/tests/common.rs     | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/jit/src/instructions.rs b/jit/src/instructions.rs
index 407a33226a..fac947a98a 100644
--- a/jit/src/instructions.rs
+++ b/jit/src/instructions.rs
@@ -1165,8 +1165,7 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> {
 
         // ----- Merge: Return the final result.
         self.builder.switch_to_block(merge_block);
-        let final_val = self.builder.block_params(merge_block)[0];
-        final_val
+        self.builder.block_params(merge_block)[0]
     }
 
     fn compile_ipow(&mut self, a: Value, b: Value) -> Value {
diff --git a/jit/src/lib.rs b/jit/src/lib.rs
index 33054b1c95..91911fd8d1 100644
--- a/jit/src/lib.rs
+++ b/jit/src/lib.rs
@@ -15,7 +15,13 @@ pub enum JitCompileError {
     #[error("bad bytecode")]
     BadBytecode,
     #[error("error while compiling to machine code: {0}")]
-    CraneliftError(#[from] ModuleError),
+    CraneliftError(Box<ModuleError>),
+}
+
+impl From<ModuleError> for JitCompileError {
+    fn from(err: ModuleError) -> Self {
+        Self::CraneliftError(Box::new(err))
+    }
 }
 
 #[derive(Debug, thiserror::Error, Eq, PartialEq)]
diff --git a/jit/tests/common.rs b/jit/tests/common.rs
index a4ac8a7967..680090eb5b 100644
--- a/jit/tests/common.rs
+++ b/jit/tests/common.rs
@@ -78,7 +78,7 @@ impl StackMachine {
 
     pub fn run(&mut self, code: CodeObject) {
         let mut oparg_state = OpArgState::default();
-        code.instructions.iter().try_for_each(|&word| {
+        let _ = code.instructions.iter().try_for_each(|&word| {
             let (instruction, arg) = oparg_state.get(word);
             self.process_instruction(instruction, arg, &code.constants, &code.names)
         });