Skip to content

Commit f7b9f20

Browse files
mohansonmohanson
authored
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
1 parent a4dab6b commit f7b9f20

26 files changed

+99
-104
lines changed

‎Cargo.toml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version = "0.24.0"
55
license = "MIT"
66
authors = ["Nervos Core Dev <dev@nervos.org>"]
77
edition = "2021"
8-
rust-version = "1.75.0"
8+
rust-version = "1.81.0"
99
build = "build.rs"
1010
exclude = ["/benches", "/tests"]
1111
homepage = "https://github.com/nervosnetwork/ckb-vm"
@@ -54,3 +54,6 @@ harness = false
5454
name = "vm_benchmark"
5555
path = "benches/vm_benchmark.rs"
5656
harness = false
57+
58+
[lints.rust]
59+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(has_asm)'] }

‎benches/vm_benchmark.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn asm_benchmark(c: &mut Criterion) {
4242
"bar"].into_iter().map(|a| a.into()).collect();
4343

4444
b.iter(|| {
45-
let asm_core = AsmCoreMachine::new(ISA_IMC, VERSION0, u64::max_value());
45+
let asm_core = AsmCoreMachine::new(ISA_IMC, VERSION0, u64::MAX);
4646
let core = DefaultMachineBuilder::new(asm_core).build();
4747
let mut machine = AsmMachine::new(core);
4848
machine.load_program(&buffer, &args[..]).unwrap();
@@ -61,7 +61,7 @@ fn mop_benchmark(c: &mut Criterion) {
6161
"foo",
6262
"bar"].into_iter().map(|a| a.into()).collect();
6363
b.iter(|| {
64-
let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_B | ISA_MOP, VERSION2, u64::max_value());
64+
let asm_core = AsmCoreMachine::new(ISA_IMC | ISA_B | ISA_MOP, VERSION2, u64::MAX);
6565
let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
6666
.build();
6767
let mut machine = AsmMachine::new(core);
@@ -83,15 +83,15 @@ fn mop_memoized_benchmark(c: &mut Criterion) {
8383
"foo",
8484
"bar"].into_iter().map(|a| a.into()).collect();
8585
let mut decoder = MemoizedFixedTraceDecoder::new(build_decoder::<u64>(isa, version));
86-
let asm_core = AsmCoreMachine::new(isa, version, u64::max_value());
86+
let asm_core = AsmCoreMachine::new(isa, version, u64::MAX);
8787
let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
8888
.build();
8989
let mut machine = AsmMachine::new(core);
9090
machine.load_program(&buffer, &args).unwrap();
9191
machine.run_with_decoder(&mut decoder).unwrap();
9292

9393
b.iter(|| {
94-
let asm_core = AsmCoreMachine::new(isa, version, u64::max_value());
94+
let asm_core = AsmCoreMachine::new(isa, version, u64::MAX);
9595
let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
9696
.build();
9797
let mut machine = AsmMachine::new(core);
@@ -114,15 +114,15 @@ fn mop_memoized_dynamic_benchmark(c: &mut Criterion) {
114114
"foo",
115115
"bar"].into_iter().map(|a| a.into()).collect();
116116
let mut decoder = MemoizedDynamicTraceDecoder::new(build_decoder::<u64>(isa, version));
117-
let asm_core = AsmCoreMachine::new(isa, version, u64::max_value());
117+
let asm_core = AsmCoreMachine::new(isa, version, u64::MAX);
118118
let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
119119
.build();
120120
let mut machine = AsmMachine::new(core);
121121
machine.load_program(&buffer, &args).unwrap();
122122
machine.run_with_decoder(&mut decoder).unwrap();
123123

124124
b.iter(|| {
125-
let asm_core = AsmCoreMachine::new(isa, version, u64::max_value());
125+
let asm_core = AsmCoreMachine::new(isa, version, u64::MAX);
126126
let core = DefaultMachineBuilder::<Box<AsmCoreMachine>>::new(asm_core)
127127
.build();
128128
let mut machine = AsmMachine::new(core);

‎definitions/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version = "0.24.0"
55
license = "MIT"
66
authors = ["Nervos Core Dev <dev@nervos.org>"]
77
edition = "2021"
8-
rust-version = "1.75.0"
8+
rust-version = "1.81.0"
99
autobins = false
1010
homepage = "https://github.com/nervosnetwork/ckb-vm"
1111
repository = "https://github.com/nervosnetwork/ckb-vm"

‎definitions/src/asm.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ impl AsmCoreMachine {
147147
machine.frames_size = (memory_size / MEMORY_FRAMESIZE) as u64;
148148
machine.flags_size = (memory_size / RISCV_PAGESIZE) as u64;
149149

150-
machine.last_read_frame = u64::max_value();
151-
machine.last_write_page = u64::max_value();
150+
machine.last_read_frame = u64::MAX;
151+
machine.last_write_page = u64::MAX;
152152

153153
let memory_layout = Layout::array::<u8>(machine.memory_size as usize).unwrap();
154154
machine.memory_ptr = unsafe { alloc(memory_layout) } as u64;

‎definitions/src/instructions.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ macro_rules! __for_each_inst_inner {
293293
/// a callback macro that takes (at least) 3 arguments:
294294
///
295295
/// 1. $name: an identifier containing the full defined opcode name,
296-
/// e.g., OP_ADD
296+
/// e.g., OP_ADD
297297
/// 2. $real_name: an identifier containing just the opcode part, e.g., ADD
298298
/// 3. $code: an expr containing the actual opcode number
299299
///
@@ -324,10 +324,10 @@ macro_rules! for_each_inst2 {
324324
/// arguments:
325325
///
326326
/// * A callback macro that takes the exact same arguments as callback
327-
/// macro in +for_each_inst+
327+
/// macro in +for_each_inst+
328328
/// * A value expression containing the actual value to match against.
329329
/// * An expression used as wildcard matches when the passed value does
330-
/// not match any opcode
330+
/// not match any opcode
331331
///
332332
/// * Free variables are attached to the variants ending with match1, match2, etc.
333333
#[macro_export]
@@ -357,7 +357,7 @@ macro_rules! for_each_inst_match2 {
357357
/// Generates an array on all instructions
358358
///
359359
/// * A callback macro that takes the exact same arguments as callback
360-
/// macro in +for_each_inst+
360+
/// macro in +for_each_inst+
361361
///
362362
/// * Free variables are attached to the variants ending with fold1, fold2, etc.
363363
#[macro_export]

‎examples/check_real_memory.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn get_current_memory_linux() -> usize {
6969
}
7070

7171
fn get_current_memory() -> usize {
72-
if !cfg!(linux) {
72+
if !cfg!(target_os = "linux") {
7373
get_current_memory_linux()
7474
} else {
7575
let pid = format!("{}", id());
@@ -168,8 +168,7 @@ fn check_asm(memory_size: usize) -> Result<(), ()> {
168168
);
169169
println!("Base memory: {}", get_current_memory());
170170
for _ in 0..G_CHECK_LOOP {
171-
let asm_core =
172-
AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::max_value(), memory_size);
171+
let asm_core = AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::MAX, memory_size);
173172
let core = DefaultMachineBuilder::new(asm_core).build();
174173
let mut machine = AsmMachine::new(core);
175174
machine
@@ -193,8 +192,7 @@ fn check_asm_in_thread(memory_size: usize) -> Result<(), ()> {
193192
);
194193
println!("Base memory: {}", get_current_memory());
195194
for _ in 0..G_CHECK_LOOP {
196-
let asm_core =
197-
AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::max_value(), memory_size);
195+
let asm_core = AsmCoreMachine::new_with_memory(ISA_IMC, VERSION0, u64::MAX, memory_size);
198196
let core = DefaultMachineBuilder::new(asm_core).build();
199197
let mut machine = AsmMachine::new(core);
200198
machine

‎fuzz/fuzz_targets/snapshot2.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl DataSource<u32> for DummyData {
6565

6666
fn build_machine() -> DefaultMachine<Box<AsmCoreMachine>> {
6767
let isa = ISA_IMC | ISA_A | ISA_B | ISA_MOP;
68-
let core_machine = AsmCoreMachine::new(isa, VERSION2, u64::max_value());
68+
let core_machine = AsmCoreMachine::new(isa, VERSION2, u64::MAX);
6969
DefaultMachineBuilder::new(core_machine).build()
7070
}
7171

‎rust-toolchain‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.75.0
1+
1.81.0

‎src/bits.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ mod tests {
2424
assert_eq!(16, roundup(15, 16));
2525
assert_eq!(16, roundup(16, 16));
2626
assert_eq!(32, roundup(17, 16));
27-
assert_eq!(u64::max_value() - 15, roundup(u64::max_value() - 15, 16));
28-
assert_eq!(0, roundup(u64::max_value(), 16));
27+
assert_eq!(u64::MAX - 15, roundup(u64::MAX - 15, 16));
28+
assert_eq!(0, roundup(u64::MAX, 16));
2929
}
3030

3131
#[test]
@@ -35,7 +35,7 @@ mod tests {
3535
assert_eq!(0, rounddown(15, 16));
3636
assert_eq!(16, rounddown(16, 16));
3737
assert_eq!(16, rounddown(17, 16));
38-
assert_eq!(u64::max_value() - 15, rounddown(u64::max_value(), 16));
38+
assert_eq!(u64::MAX - 15, rounddown(u64::MAX, 16));
3939
}
4040

4141
proptest! {

‎src/instructions/ast.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ impl Register for Value {
149149
}
150150

151151
fn min_value() -> Value {
152-
Value::Imm(u64::min_value())
152+
Value::Imm(u64::MIN)
153153
}
154154

155155
fn max_value() -> Value {
156-
Value::Imm(u64::max_value())
156+
Value::Imm(u64::MAX)
157157
}
158158

159159
fn eq(&self, other: &Value) -> Value {

0 commit comments

Comments
 (0)