Update rust toolchain to v1.81.0 (#442)

* Update rust toolchain to v1.81.0 * Add lints config * Avoid to use legacy numeric method * Fix cargo check
nervosnetwork · Oct 22, 2024 · f7b9f20 · f7b9f20
1 parent a4dab6b
commit f7b9f20
Show file tree

Hide file tree

Showing 26 changed files with 99 additions and 104 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.24.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2021"
-rust-version = "1.75.0"
+rust-version = "1.81.0"
 build = "build.rs"
 exclude = ["/benches", "/tests"]
 homepage = "https://github.com/nervosnetwork/ckb-vm"
@@ -54,3 +54,6 @@ harness = false
 name = "vm_benchmark"
 path = "benches/vm_benchmark.rs"
 harness = false
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(has_asm)'] }
diff --git a/benches/vm_benchmark.rs b/benches/vm_benchmark.rs
@@ -42,7 +42,7 @@ fn asm_benchmark(c: &mut Criterion) {
                                       "bar"].into_iter().map(|a| a.into()).collect();
 
         b.iter(|| {
-            let asm_core = AsmCoreMachine::new(ISA_IMC, VERSION0, u64::max_value());
+            let asm_core = AsmCoreMachine::new(ISA_IMC, VERSION0, u64::MAX);
             let core = DefaultMachineBuilder::new(asm_core).build();
             let mut machine = AsmMachine::new(core);
             machine.load_program(&buffer, &args[..]).unwrap();
@@ -61,7 +61,7 @@ fn mop_benchmark(c: &mut Criterion) {
                                       "foo",
                                       "bar"].into_iter().map(|a| a.into()).collect();
         b.iter(|| {
-            let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_B | ISA_MOP, VERSION2, u64::max_value());
+            let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_B | ISA_MOP, VERSION2, u64::MAX);
             let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
                 .build();
             let mut machine = AsmMachine::new(core);
@@ -83,15 +83,15 @@ fn mop_memoized_benchmark(c: &mut Criterion) {
                                       "foo",
                                       "bar"].into_iter().map(|a| a.into()).collect();
         let mut decoder = MemoizedFixedTraceDecoder::new(build_decoder::<u64>(isa, version));
-        let asm_core = AsmCoreMachine::new(isa, version, u64::max_value());
+        let asm_core = AsmCoreMachine::new(isa, version, u64::MAX);
         let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
             .build();
         let mut machine = AsmMachine::new(core);
         machine.load_program(&buffer, &args).unwrap();
         machine.run_with_decoder(&mut decoder).unwrap();
 
         b.iter(|| {
-            let asm_core = AsmCoreMachine::new(isa, version, u64::max_value());
+            let asm_core = AsmCoreMachine::new(isa, version, u64::MAX);
             let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
                 .build();
             let mut machine = AsmMachine::new(core);
@@ -114,15 +114,15 @@ fn mop_memoized_dynamic_benchmark(c: &mut Criterion) {
                                       "foo",
                                       "bar"].into_iter().map(|a| a.into()).collect();
         let mut decoder = MemoizedDynamicTraceDecoder::new(build_decoder::<u64>(isa, version));
-        let asm_core = AsmCoreMachine::new(isa, version, u64::max_value());
+        let asm_core = AsmCoreMachine::new(isa, version, u64::MAX);
         let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
             .build();
         let mut machine = AsmMachine::new(core);
         machine.load_program(&buffer, &args).unwrap();
         machine.run_with_decoder(&mut decoder).unwrap();
 
         b.iter(|| {
-            let asm_core = AsmCoreMachine::new(isa, version, u64::max_value());
+            let asm_core = AsmCoreMachine::new(isa, version, u64::MAX);
             let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
                 .build();
             let mut machine = AsmMachine::new(core);

diff --git a/definitions/Cargo.toml b/definitions/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.24.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2021"
-rust-version = "1.75.0"
+rust-version = "1.81.0"
 autobins = false
 homepage = "https://github.com/nervosnetwork/ckb-vm"
 repository = "https://github.com/nervosnetwork/ckb-vm"

diff --git a/definitions/src/asm.rs b/definitions/src/asm.rs
@@ -147,8 +147,8 @@ impl AsmCoreMachine {
         machine.frames_size = (memory_size / MEMORY_FRAMESIZE) as u64;
         machine.flags_size = (memory_size / RISCV_PAGESIZE) as u64;
 
-        machine.last_read_frame = u64::max_value();
-        machine.last_write_page = u64::max_value();
+        machine.last_read_frame = u64::MAX;
+        machine.last_write_page = u64::MAX;
 
         let memory_layout = Layout::array::<u8>(machine.memory_size as usize).unwrap();
         machine.memory_ptr = unsafe { alloc(memory_layout) } as u64;

diff --git a/definitions/src/instructions.rs b/definitions/src/instructions.rs
@@ -293,7 +293,7 @@ macro_rules! __for_each_inst_inner {
 /// a callback macro that takes (at least) 3 arguments:
 ///
 /// 1. $name: an identifier containing the full defined opcode name,
-/// e.g., OP_ADD
+///     e.g., OP_ADD
 /// 2. $real_name: an identifier containing just the opcode part, e.g., ADD
 /// 3. $code: an expr containing the actual opcode number
 ///
@@ -324,10 +324,10 @@ macro_rules! for_each_inst2 {
 /// arguments:
 ///
 /// * A callback macro that takes the exact same arguments as callback
-/// macro in +for_each_inst+
+///     macro in +for_each_inst+
 /// * A value expression containing the actual value to match against.
 /// * An expression used as wildcard matches when the passed value does
-/// not match any opcode
+///     not match any opcode
 ///
 /// * Free variables are attached to the variants ending with match1, match2, etc.
 #[macro_export]
@@ -357,7 +357,7 @@ macro_rules! for_each_inst_match2 {
 /// Generates an array on all instructions
 ///
 /// * A callback macro that takes the exact same arguments as callback
-/// macro in +for_each_inst+
+///     macro in +for_each_inst+
 ///
 /// * Free variables are attached to the variants ending with fold1, fold2, etc.
 #[macro_export]

diff --git a/examples/check_real_memory.rs b/examples/check_real_memory.rs
@@ -69,7 +69,7 @@ fn get_current_memory_linux() -> usize {
 }
 
 fn get_current_memory() -> usize {
-    if !cfg!(linux) {
+    if !cfg!(target_os = "linux") {
         get_current_memory_linux()
     } else {
         let pid = format!("{}", id());
@@ -168,8 +168,7 @@ fn check_asm(memory_size: usize) -> Result<(), ()> {
     );
     println!("Base memory: {}", get_current_memory());
     for _ in 0..G_CHECK_LOOP {
-        let asm_core =
-            AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::max_value(), memory_size);
+        let asm_core = AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::MAX, memory_size);
         let core = DefaultMachineBuilder::new(asm_core).build();
         let mut machine = AsmMachine::new(core);
         machine
@@ -193,8 +192,7 @@ fn check_asm_in_thread(memory_size: usize) -> Result<(), ()> {
     );
     println!("Base memory: {}", get_current_memory());
     for _ in 0..G_CHECK_LOOP {
-        let asm_core =
-            AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::max_value(), memory_size);
+        let asm_core = AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::MAX, memory_size);
         let core = DefaultMachineBuilder::new(asm_core).build();
         let mut machine = AsmMachine::new(core);
         machine

diff --git a/fuzz/fuzz_targets/snapshot2.rs b/fuzz/fuzz_targets/snapshot2.rs
@@ -65,7 +65,7 @@ impl DataSource<u32> for DummyData {
 
 fn build_machine() -> DefaultMachine<Box<AsmCoreMachine>> {
     let isa = ISA_IMC | ISA_A | ISA_B | ISA_MOP;
-    let core_machine = AsmCoreMachine::new(isa, VERSION2, u64::max_value());
+    let core_machine = AsmCoreMachine::new(isa, VERSION2, u64::MAX);
     DefaultMachineBuilder::new(core_machine).build()
 }
 

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.75.0
+1.81.0
diff --git a/src/bits.rs b/src/bits.rs
@@ -24,8 +24,8 @@ mod tests {
         assert_eq!(16, roundup(15, 16));
         assert_eq!(16, roundup(16, 16));
         assert_eq!(32, roundup(17, 16));
-        assert_eq!(u64::max_value() - 15, roundup(u64::max_value() - 15, 16));
-        assert_eq!(0, roundup(u64::max_value(), 16));
+        assert_eq!(u64::MAX - 15, roundup(u64::MAX - 15, 16));
+        assert_eq!(0, roundup(u64::MAX, 16));
     }
 
     #[test]
@@ -35,7 +35,7 @@ mod tests {
         assert_eq!(0, rounddown(15, 16));
         assert_eq!(16, rounddown(16, 16));
         assert_eq!(16, rounddown(17, 16));
-        assert_eq!(u64::max_value() - 15, rounddown(u64::max_value(), 16));
+        assert_eq!(u64::MAX - 15, rounddown(u64::MAX, 16));
     }
 
     proptest! {

diff --git a/src/instructions/ast.rs b/src/instructions/ast.rs
@@ -149,11 +149,11 @@ impl Register for Value {
     }
 
     fn min_value() -> Value {
-        Value::Imm(u64::min_value())
+        Value::Imm(u64::MIN)
     }
 
     fn max_value() -> Value {
-        Value::Imm(u64::max_value())
+        Value::Imm(u64::MAX)
     }
 
     fn eq(&self, other: &Value) -> Value {

diff --git a/src/instructions/mod.rs b/src/instructions/mod.rs
@@ -457,14 +457,14 @@ mod tests {
     fn test_stype_display() {
         // This is "sd	a5,568(sp)"
         let sd_inst = 0x22f13c23;
-        let decoded = factory::<u64>(sd_inst, u32::max_value()).expect("decoding");
+        let decoded = factory::<u64>(sd_inst, u32::MAX).expect("decoding");
         let stype = Stype(decoded);
 
         assert_eq!("sd a5,568(sp)", format!("{}", stype));
 
         // This is "beq	a0,a5,1012e"
         let sd_inst = 0xf4f500e3;
-        let decoded = factory::<u64>(sd_inst, u32::max_value()).expect("decoding");
+        let decoded = factory::<u64>(sd_inst, u32::MAX).expect("decoding");
         let stype = Stype(decoded);
 
         assert_eq!("beq a0,a5,-192", format!("{}", stype));

diff --git a/src/instructions/register.rs b/src/instructions/register.rs
@@ -138,11 +138,11 @@ impl Register for u32 {
     }
 
     fn min_value() -> u32 {
-        u32::min_value()
+        u32::MIN
     }
 
     fn max_value() -> u32 {
-        u32::max_value()
+        u32::MAX
     }
 
     fn eq(&self, other: &u32) -> u32 {
@@ -183,7 +183,7 @@ impl Register for u32 {
 
     fn overflowing_div(&self, rhs: &u32) -> u32 {
         if *rhs == 0 {
-            Self::max_value()
+            Self::MAX
         } else {
             (*self).overflowing_div(*rhs).0
         }
@@ -423,11 +423,11 @@ impl Register for u64 {
     }
 
     fn min_value() -> u64 {
-        u64::min_value()
+        u64::MIN
     }
 
     fn max_value() -> u64 {
-        u64::max_value()
+        u64::MAX
     }
 
     fn eq(&self, other: &u64) -> u64 {
@@ -468,7 +468,7 @@ impl Register for u64 {
 
     fn overflowing_div(&self, rhs: &u64) -> u64 {
         if *rhs == 0 {
-            Self::max_value()
+            Self::MAX
         } else {
             (*self).overflowing_div(*rhs).0
         }

diff --git a/src/lib.rs b/src/lib.rs
@@ -43,7 +43,7 @@ pub fn run<R: Register, M: Memory<REG = R> + Default>(
     let core_machine = DefaultCoreMachine::<R, WXorXMemory<M>>::new_with_memory(
         ISA_IMC | ISA_A | ISA_B | ISA_MOP,
         machine::VERSION2,
-        u64::max_value(),
+        u64::MAX,
         WXorXMemory::new(M::default()),
     );
     let mut machine = TraceMachine::new(DefaultMachineBuilder::new(core_machine).build());
@@ -59,7 +59,7 @@ pub fn run_with_memory<R: Register, M: Memory<REG = R>>(
     let core_machine = DefaultCoreMachine::<R, WXorXMemory<M>>::new_with_memory(
         ISA_IMC | ISA_A | ISA_B | ISA_MOP,
         machine::VERSION2,
-        u64::max_value(),
+        u64::MAX,
         WXorXMemory::new(memory),
     );
     let mut machine = TraceMachine::new(DefaultMachineBuilder::new(core_machine).build());

diff --git a/src/machine/asm/mod.rs b/src/machine/asm/mod.rs
@@ -366,8 +366,8 @@ impl Memory for Box<AsmCoreMachine> {
         let slice = self.cast_ptr_to_slice_mut(self.frames_ptr, 0, self.frames_size as usize);
         memset(slice, 0);
         self.load_reservation_address = u64::MAX;
-        self.last_read_frame = u64::max_value();
-        self.last_write_page = u64::max_value();
+        self.last_read_frame = u64::MAX;
+        self.last_write_page = u64::MAX;
         Ok(())
     }
 
@@ -421,8 +421,8 @@ impl Memory for Box<AsmCoreMachine> {
             current_addr += RISCV_PAGESIZE as u64;
         }
         // Clear last read/write page cache
-        self.last_read_frame = u64::max_value();
-        self.last_write_page = u64::max_value();
+        self.last_read_frame = u64::MAX;
+        self.last_write_page = u64::MAX;
         Ok(())
     }
 
@@ -443,7 +443,7 @@ impl Memory for Box<AsmCoreMachine> {
             let slice = self.cast_ptr_to_slice_mut(self.flags_ptr, page as usize, 1);
             slice[0] |= flag;
             // Clear last write page cache
-            self.last_write_page = u64::max_value();
+            self.last_write_page = u64::MAX;
             Ok(())
         } else {
             Err(Error::MemOutOfBound(
@@ -458,7 +458,7 @@ impl Memory for Box<AsmCoreMachine> {
             let slice = self.cast_ptr_to_slice_mut(self.flags_ptr, page as usize, 1);
             slice[0] &= !flag;
             // Clear last write page cache
-            self.last_write_page = u64::max_value();
+            self.last_write_page = u64::MAX;
             Ok(())
         } else {
             Err(Error::MemOutOfBound(

diff --git a/src/snapshot2.rs b/src/snapshot2.rs
@@ -140,7 +140,7 @@ impl<I: Clone + PartialEq, D: DataSource<I>> Snapshot2Context<I, D> {
     /// 1. use elf::parse_elf to generate ProgramMetadata
     /// 2. use DefaultMachine::load_program_with_metadata to load the program
     /// 3. Pass ProgramMetadata to this method so we can track memory pages from
-    /// program, so as to further reduce the size of the generated snapshot.
+    ///     program, so as to further reduce the size of the generated snapshot.
     ///
     /// One can also use the original DefaultMachine::load_program, and parse the
     /// ELF a second time to extract metadata for this method. However the above

diff --git a/tests/machine_build.rs b/tests/machine_build.rs
@@ -32,7 +32,7 @@ impl<Mac: SupportMachine> Syscalls<Mac> for SleepSyscall {
 #[cfg(has_asm)]
 pub fn asm_v1_imcb(path: &str) -> AsmMachine {
     let buffer: Bytes = std::fs::read(path).unwrap().into();
-    let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_B, VERSION1, u64::max_value());
+    let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_B, VERSION1, u64::MAX);
     let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
         .instruction_cycle_func(Box::new(constant_cycles))
         .syscall(Box::new(SleepSyscall {}))
@@ -51,7 +51,7 @@ pub fn int_v1_imcb(
     let core_machine = DefaultCoreMachine::<u64, WXorXMemory<SparseMemory<u64>>>::new(
         ISA_IMC | ISA_B,
         VERSION1,
-        u64::max_value(),
+        u64::MAX,
     );
     let mut machine = TraceMachine::new(
         DefaultMachineBuilder::new(core_machine)
@@ -73,7 +73,7 @@ pub fn asm_v1_mop(path: &str, args: Vec<Bytes>) -> AsmMachine {
 #[cfg(has_asm)]
 pub fn asm_mop(path: &str, args: Vec<Bytes>, version: u32) -> AsmMachine {
     let buffer: Bytes = std::fs::read(path).unwrap().into();
-    let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_B | ISA_MOP, version, u64::max_value());
+    let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_B | ISA_MOP, version, u64::MAX);
     let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
         .instruction_cycle_func(Box::new(constant_cycles))
         .syscall(Box::new(SleepSyscall {}))
@@ -101,7 +101,7 @@ pub fn int_mop(
     let core_machine = DefaultCoreMachine::<u64, WXorXMemory<SparseMemory<u64>>>::new(
         ISA_IMC | ISA_B | ISA_MOP,
         version,
-        u64::max_value(),
+        u64::MAX,
     );
     let mut machine = TraceMachine::new(
         DefaultMachineBuilder::new(core_machine)
@@ -118,7 +118,7 @@ pub fn int_mop(
 #[cfg(has_asm)]
 pub fn asm_v2_imacb(path: &str) -> AsmMachine {
     let buffer: Bytes = std::fs::read(path).unwrap().into();
-    let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_A | ISA_B, VERSION2, u64::max_value());
+    let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_A | ISA_B, VERSION2, u64::MAX);
     let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
         .instruction_cycle_func(Box::new(constant_cycles))
         .syscall(Box::new(SleepSyscall {}))
@@ -137,7 +137,7 @@ pub fn int_v2_imacb(
     let core_machine = DefaultCoreMachine::<u64, WXorXMemory<SparseMemory<u64>>>::new(
         ISA_IMC | ISA_A | ISA_B,
         VERSION2,
-        u64::max_value(),
+        u64::MAX,
     );
     let mut machine = TraceMachine::new(
         DefaultMachineBuilder::new(core_machine)