Fix warnings for rust 1.87

coolreader18 · youknowone · commit 2c02e2776ba8 · 2025-05-16T18:52:14.000+09:00
diff --git 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
@@ -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
@@ -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)
         });

Original file line number	Diff line number	Diff line change
`@@ -1165,8 +1165,7 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> {`
`1165`	`1165`
`1166`	`1166`	`// ----- Merge: Return the final result.`
`1167`	`1167`	`self.builder.switch_to_block(merge_block);`
`1168`		`- let final_val = self.builder.block_params(merge_block)[0];`
`1169`		`- final_val`
	`1168`	`+ self.builder.block_params(merge_block)[0]`
`1170`	`1169`	`}`
`1171`	`1170`
`1172`	`1171`	`fn compile_ipow(&mut self, a: Value, b: Value) -> Value {`