Skip to content

Commit 4558dbf

Browse files
OddCoincidenceOddCoincidence
committed
Fix build (rustfmt)
1 parent b98926a commit 4558dbf

File tree

3 files changed

+13
-64
lines changed

3 files changed

+13
-64
lines changed

‎vm/src/obj/objcode.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ fn code_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
5555
Ok(vm.new_str(repr))
5656
}
5757

58-
fn member_code_obj(
59-
vm: &mut VirtualMachine,
60-
args: PyFuncArgs,
61-
) -> PyResult<bytecode::CodeObject> {
58+
fn member_code_obj(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult<bytecode::CodeObject> {
6259
arg_check!(
6360
vm,
6461
args,

‎vm/src/obj/objint.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ fn int_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
8383
}
8484

8585
// Casting function:
86-
pub fn to_int(
87-
vm: &mut VirtualMachine,
88-
obj: &PyObjectRef,
89-
base: u32,
90-
) -> PyResult<IntType> {
86+
pub fn to_int(vm: &mut VirtualMachine, obj: &PyObjectRef, base: u32) -> PyResult<IntType> {
9187
let val = if objtype::isinstance(obj, &vm.ctx.int_type()) {
9288
get_value(obj)
9389
} else if objtype::isinstance(obj, &vm.ctx.float_type()) {

‎vm/src/stdlib/pystruct.rs

Lines changed: 11 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,19 @@ fn get_int(vm: &mut VirtualMachine, arg: &PyObjectRef) -> PyResult<BigInt> {
4646
objint::to_int(vm, arg, 10)
4747
}
4848

49-
fn pack_i8(
50-
vm: &mut VirtualMachine,
51-
arg: &PyObjectRef,
52-
data: &mut Write,
53-
) -> PyResult<()> {
49+
fn pack_i8(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
5450
let v = get_int(vm, arg)?.to_i8().unwrap();
5551
data.write_i8(v).unwrap();
5652
Ok(())
5753
}
5854

59-
fn pack_u8(
60-
vm: &mut VirtualMachine,
61-
arg: &PyObjectRef,
62-
data: &mut Write,
63-
) -> PyResult<()> {
55+
fn pack_u8(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
6456
let v = get_int(vm, arg)?.to_u8().unwrap();
6557
data.write_u8(v).unwrap();
6658
Ok(())
6759
}
6860

69-
fn pack_bool(
70-
vm: &mut VirtualMachine,
71-
arg: &PyObjectRef,
72-
data: &mut Write,
73-
) -> PyResult<()> {
61+
fn pack_bool(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
7462
if objtype::isinstance(&arg, &vm.ctx.bool_type()) {
7563
let v = if objbool::get_value(arg) { 1 } else { 0 };
7664
data.write_u8(v).unwrap();
@@ -80,71 +68,43 @@ fn pack_bool(
8068
}
8169
}
8270

83-
fn pack_i16(
84-
vm: &mut VirtualMachine,
85-
arg: &PyObjectRef,
86-
data: &mut Write,
87-
) -> PyResult<()> {
71+
fn pack_i16(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
8872
let v = get_int(vm, arg)?.to_i16().unwrap();
8973
data.write_i16::<LittleEndian>(v).unwrap();
9074
Ok(())
9175
}
9276

93-
fn pack_u16(
94-
vm: &mut VirtualMachine,
95-
arg: &PyObjectRef,
96-
data: &mut Write,
97-
) -> PyResult<()> {
77+
fn pack_u16(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
9878
let v = get_int(vm, arg)?.to_u16().unwrap();
9979
data.write_u16::<LittleEndian>(v).unwrap();
10080
Ok(())
10181
}
10282

103-
fn pack_i32(
104-
vm: &mut VirtualMachine,
105-
arg: &PyObjectRef,
106-
data: &mut Write,
107-
) -> PyResult<()> {
83+
fn pack_i32(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
10884
let v = get_int(vm, arg)?.to_i32().unwrap();
10985
data.write_i32::<LittleEndian>(v).unwrap();
11086
Ok(())
11187
}
11288

113-
fn pack_u32(
114-
vm: &mut VirtualMachine,
115-
arg: &PyObjectRef,
116-
data: &mut Write,
117-
) -> PyResult<()> {
89+
fn pack_u32(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
11890
let v = get_int(vm, arg)?.to_u32().unwrap();
11991
data.write_u32::<LittleEndian>(v).unwrap();
12092
Ok(())
12193
}
12294

123-
fn pack_i64(
124-
vm: &mut VirtualMachine,
125-
arg: &PyObjectRef,
126-
data: &mut Write,
127-
) -> PyResult<()> {
95+
fn pack_i64(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
12896
let v = get_int(vm, arg)?.to_i64().unwrap();
12997
data.write_i64::<LittleEndian>(v).unwrap();
13098
Ok(())
13199
}
132100

133-
fn pack_u64(
134-
vm: &mut VirtualMachine,
135-
arg: &PyObjectRef,
136-
data: &mut Write,
137-
) -> PyResult<()> {
101+
fn pack_u64(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
138102
let v = get_int(vm, arg)?.to_u64().unwrap();
139103
data.write_u64::<LittleEndian>(v).unwrap();
140104
Ok(())
141105
}
142106

143-
fn pack_f32(
144-
vm: &mut VirtualMachine,
145-
arg: &PyObjectRef,
146-
data: &mut Write,
147-
) -> PyResult<()> {
107+
fn pack_f32(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
148108
if objtype::isinstance(&arg, &vm.ctx.float_type()) {
149109
let v = objfloat::get_value(arg) as f32;
150110
data.write_f32::<LittleEndian>(v).unwrap();
@@ -154,11 +114,7 @@ fn pack_f32(
154114
}
155115
}
156116

157-
fn pack_f64(
158-
vm: &mut VirtualMachine,
159-
arg: &PyObjectRef,
160-
data: &mut Write,
161-
) -> PyResult<()> {
117+
fn pack_f64(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> {
162118
if objtype::isinstance(&arg, &vm.ctx.float_type()) {
163119
let v = objfloat::get_value(arg) as f64;
164120
data.write_f64::<LittleEndian>(v).unwrap();

0 commit comments

Comments
 (0)