Use rust edition 2024 (#474)

* Use rust edition 2024

* Make no_mangle unsafe

* Fix clippy

Author: mohanson

Cargo.toml

@@ -4,8 +4,8 @@ description = "CKB's Virtual machine"
 version = "0.24.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
-edition = "2021"
-rust-version = "1.81.0"
+edition = "2024"
+rust-version = "1.85.0"
 build = "build.rs"
 exclude = ["/benches", "/tests"]
 homepage = "https://github.com/nervosnetwork/ckb-vm"

benches/vm_benchmark.rs

@@ -4,17 +4,17 @@ extern crate criterion;
 use bytes::Bytes;
 #[cfg(has_asm)]
 use ckb_vm::{
+    ISA_B, ISA_IMC, ISA_MOP,
     decoder::{DefaultDecoder, InstDecoder},
     machine::{
+        AbstractDefaultMachineBuilder, DefaultMachineRunner, SupportMachine, VERSION0, VERSION2,
         asm::{
-            traces::{MemoizedDynamicTraceDecoder, MemoizedFixedTraceDecoder},
             AbstractAsmMachine, AsmCoreMachine, AsmDefaultMachineBuilder, AsmMachine,
+            traces::{MemoizedDynamicTraceDecoder, MemoizedFixedTraceDecoder},
         },
-        AbstractDefaultMachineBuilder, DefaultMachineRunner, SupportMachine, VERSION0, VERSION2,
     },
-    ISA_B, ISA_IMC, ISA_MOP,
 };
-use ckb_vm::{run, SparseMemory};
+use ckb_vm::{SparseMemory, run};
 use criterion::Criterion;
 use std::fs;
 

definitions/Cargo.toml

@@ -4,8 +4,8 @@ description = "Common definition files for CKB VM"
 version = "0.24.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
-edition = "2021"
-rust-version = "1.81.0"
+edition = "2024"
+rust-version = "1.85.0"
 autobins = false
 homepage = "https://github.com/nervosnetwork/ckb-vm"
 repository = "https://github.com/nervosnetwork/ckb-vm"

definitions/src/asm.rs

@@ -1,5 +1,5 @@
-use crate::{instructions::Instruction, RISCV_GENERAL_REGISTER_NUMBER};
-use std::alloc::{dealloc, Layout};
+use crate::{RISCV_GENERAL_REGISTER_NUMBER, instructions::Instruction};
+use std::alloc::{Layout, dealloc};
 
 // The number of trace items to keep
 pub const TRACE_SIZE: usize = 8192;

definitions/src/generate_asm_constants.rs

@@ -1,17 +1,17 @@
 use ckb_vm_definitions::{
+    MEMORY_FRAME_PAGE_SHIFTS, MEMORY_FRAME_SHIFTS, MEMORY_FRAMESIZE, RISCV_PAGE_SHIFTS,
+    RISCV_PAGESIZE,
     asm::{
         AsmCoreMachine, FixedTrace, InvokeData, RET_CYCLES_OVERFLOW, RET_DECODE_TRACE,
         RET_DYNAMIC_JUMP, RET_EBREAK, RET_ECALL, RET_INVALID_PERMISSION, RET_MAX_CYCLES_EXCEEDED,
         RET_OUT_OF_BOUND, RET_PAUSE, RET_SLOWPATH, TRACE_ITEM_LENGTH,
     },
     for_each_inst,
-    instructions::{instruction_opcode_name, MAXIMUM_OPCODE, MINIMAL_OPCODE},
+    instructions::{MAXIMUM_OPCODE, MINIMAL_OPCODE, instruction_opcode_name},
     memory::{FLAG_DIRTY, FLAG_EXECUTABLE, FLAG_FREEZED, FLAG_WRITABLE, FLAG_WXORX_BIT},
     registers::{RA, SP},
-    MEMORY_FRAMESIZE, MEMORY_FRAME_PAGE_SHIFTS, MEMORY_FRAME_SHIFTS, RISCV_PAGESIZE,
-    RISCV_PAGE_SHIFTS,
 };
-use std::alloc::{alloc, Layout};
+use std::alloc::{Layout, alloc};
 use std::mem::{size_of, zeroed};
 
 macro_rules! print_inst_label {

examples/check_real_memory.rs

@@ -1,16 +1,16 @@
 // This example is mainly to test whether there is memory overflow.
 // Under linux, we choose to use smem, which can monitor memory changes more accurately
 
-use ckb_vm::{run_with_memory, Bytes, FlatMemory, SparseMemory};
-use std::process::{id, Command};
+use ckb_vm::{Bytes, FlatMemory, SparseMemory, run_with_memory};
+use std::process::{Command, id};
 
 #[cfg(has_asm)]
 use ckb_vm::{
+    ISA_IMC,
     machine::{
-        asm::{AsmCoreMachine, AsmDefaultMachineBuilder, AsmMachine},
         DefaultMachineRunner, SupportMachine, VERSION0,
+        asm::{AsmCoreMachine, AsmDefaultMachineBuilder, AsmMachine},
     },
-    ISA_IMC,
 };
 
 #[cfg(has_asm)]

rust-toolchain

@@ -1 +1 @@
-1.81.0
+1.85.0

src/cost_model.rs

@@ -1,6 +1,6 @@
 use crate::{
-    instructions::{extract_opcode, insts},
     Instruction,
+    instructions::{extract_opcode, insts},
 };
 
 // Returns the spent cycles to execute the specific instruction.

src/debugger.rs

@@ -1,4 +1,4 @@
-use crate::{machine::SupportMachine, Error};
+use crate::{Error, machine::SupportMachine};
 
 pub trait Debugger<Mac: SupportMachine>: Send + Sync {
     fn initialize(&mut self, machine: &mut Mac) -> Result<(), Error>;

src/decoder.rs

@@ -3,8 +3,8 @@ use ckb_vm_definitions::registers::{RA, ZERO};
 
 use crate::error::OutOfBoundKind;
 use crate::instructions::{
-    a, b, extract_opcode, i, instruction_length, m, rvc, set_instruction_length_n, Instruction,
-    InstructionFactory, Itype, R4type, R5type, Register, Rtype, Utype,
+    Instruction, InstructionFactory, Itype, R4type, R5type, Register, Rtype, Utype, a, b,
+    extract_opcode, i, instruction_length, m, rvc, set_instruction_length_n,
 };
 use crate::machine::VERSION2;
 use crate::memory::Memory;