Upgrade rust-toolchain from 1.85.0 to 1.92.0 (#501)

mohanson · web-flow · commit 9a47b04ec748 · 2025-12-26T18:22:31.000+08:00
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 = "2024"
-rust-version = "1.85.0"
+rust-version = "1.92.0"
 build = "build.rs"
 exclude = ["/benches", "/tests"]
 homepage = "https://github.com/nervosnetwork/ckb-vm"
diff --git a/Makefile b/Makefile
@@ -23,6 +23,7 @@ clippy_rule = -D warnings \
 	-D clippy::clone_on_ref_ptr \
 	-D clippy::enum_glob_use \
 	-A clippy::collapsible-else-if \
+	-A clippy::collapsible_if \
 	-A clippy::upper_case_acronyms \
 	-A clippy::unusual_byte_groupings \
 	-A clippy::inconsistent_digit_grouping \
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 = "2024"
-rust-version = "1.85.0"
+rust-version = "1.92.0"
 autobins = false
 homepage = "https://github.com/nervosnetwork/ckb-vm"
 repository = "https://github.com/nervosnetwork/ckb-vm"
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/rust-toolchain b/rust-toolchain
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.92.0"
diff --git a/src/instructions/mod.rs b/src/instructions/mod.rs
@@ -430,7 +430,7 @@ pub fn set_instruction_length_4(i: u64) -> u64 {
 
 #[inline(always)]
 pub fn set_instruction_length_n(i: u64, n: u8) -> u64 {
-    debug_assert!(n % 2 == 0);
+    debug_assert!(n.is_multiple_of(2));
     debug_assert!(n <= 30);
     i | ((n as u64 & 0x1f) >> 1 << 24)
 }
diff --git a/src/machine/mod.rs b/src/machine/mod.rs
@@ -730,7 +730,7 @@ impl<Inner: SupportMachine, Decoder> DefaultMachine<Inner, Decoder> {
             self.initialize_stack(args, (memory_size - stack_size) as u64, stack_size as u64)?;
         // Make sure SP is 16 byte aligned
         if self.inner.version() >= VERSION1 {
-            debug_assert!(self.registers()[SP].to_u64() % 16 == 0);
+            debug_assert!(self.registers()[SP].to_u64().is_multiple_of(16));
         }
         Ok(stack_bytes)
     }
diff --git a/src/memory/flat.rs b/src/memory/flat.rs
@@ -36,7 +36,7 @@ impl<R: Register> Memory for FlatMemory<R> {
     type REG = R;
 
     fn new(memory_size: usize) -> Self {
-        assert!(memory_size % RISCV_PAGESIZE == 0);
+        assert!(memory_size.is_multiple_of(RISCV_PAGESIZE));
         Self {
             data: vec![0; memory_size],
             flags: vec![0; memory_size / RISCV_PAGESIZE],
diff --git a/src/memory/sparse.rs b/src/memory/sparse.rs
@@ -71,7 +71,7 @@ impl<R: Register> Memory for SparseMemory<R> {
     type REG = R;
 
     fn new(memory_size: usize) -> Self {
-        assert!(memory_size % RISCV_PAGESIZE == 0);
+        assert!(memory_size.is_multiple_of(RISCV_PAGESIZE));
         Self {
             indices: vec![INVALID_PAGE_INDEX; memory_size / RISCV_PAGESIZE],
             pages: Vec::new(),
diff --git a/src/snapshot2.rs b/src/snapshot2.rs
@@ -71,7 +71,7 @@ impl<I: Clone + PartialEq, D: DataSource<I>> Snapshot2Context<I, D> {
                 return Err(Error::MemPageUnalignedAccess(*address));
             }
             let (data, _) = self.load_data(id, *offset, *length)?;
-            if data.len() as u64 % PAGE_SIZE != 0 {
+            if !(data.len() as u64).is_multiple_of(PAGE_SIZE) {
                 return Err(Error::MemPageUnalignedAccess(
                     address.wrapping_add(data.len() as u64),
                 ));
@@ -87,7 +87,7 @@ impl<I: Clone + PartialEq, D: DataSource<I>> Snapshot2Context<I, D> {
             if address % PAGE_SIZE != 0 {
                 return Err(Error::MemPageUnalignedAccess(*address));
             }
-            if content.len() as u64 % PAGE_SIZE != 0 {
+            if !(content.len() as u64).is_multiple_of(PAGE_SIZE) {
                 return Err(Error::MemPageUnalignedAccess(
                     address.wrapping_add(content.len() as u64),
                 ));
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ pub fn set_instruction_length_4(i: u64) -> u64 {`
`430`	`430`
`431`	`431`	`#[inline(always)]`
`432`	`432`	`pub fn set_instruction_length_n(i: u64, n: u8) -> u64 {`
`433`		`- debug_assert!(n % 2 == 0);`
	`433`	`+ debug_assert!(n.is_multiple_of(2));`
`434`	`434`	`debug_assert!(n <= 30);`
`435`	`435`	`i \| ((n as u64 & 0x1f) >> 1 << 24)`
`436`	`436`	`}`
Original file line number	Diff line number	Diff line change
`@@ -730,7 +730,7 @@ impl<Inner: SupportMachine, Decoder> DefaultMachine<Inner, Decoder> {`
`730`	`730`	`self.initialize_stack(args, (memory_size - stack_size) as u64, stack_size as u64)?;`
`731`	`731`	`// Make sure SP is 16 byte aligned`
`732`	`732`	`if self.inner.version() >= VERSION1 {`
`733`		`- debug_assert!(self.registers()[SP].to_u64() % 16 == 0);`
	`733`	`+ debug_assert!(self.registers()[SP].to_u64().is_multiple_of(16));`
`734`	`734`	`}`
`735`	`735`	`Ok(stack_bytes)`
`736`	`736`	`}`