diff --git a/vm/src/obj/objcode.rs b/vm/src/obj/objcode.rs index c9f244466..53ea55f4c 100644 --- a/vm/src/obj/objcode.rs +++ b/vm/src/obj/objcode.rs @@ -55,10 +55,7 @@ fn code_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult { Ok(vm.new_str(repr)) } -fn member_code_obj( - vm: &mut VirtualMachine, - args: PyFuncArgs, -) -> PyResult { +fn member_code_obj(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult { arg_check!( vm, args, diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs index 8fb5bcdd1..a79dfb6dd 100644 --- a/vm/src/obj/objint.rs +++ b/vm/src/obj/objint.rs @@ -83,11 +83,7 @@ fn int_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult { } // Casting function: -pub fn to_int( - vm: &mut VirtualMachine, - obj: &PyObjectRef, - base: u32, -) -> PyResult { +pub fn to_int(vm: &mut VirtualMachine, obj: &PyObjectRef, base: u32) -> PyResult { let val = if objtype::isinstance(obj, &vm.ctx.int_type()) { get_value(obj) } else if objtype::isinstance(obj, &vm.ctx.float_type()) { diff --git a/vm/src/stdlib/pystruct.rs b/vm/src/stdlib/pystruct.rs index 5599e61a4..c96bba736 100644 --- a/vm/src/stdlib/pystruct.rs +++ b/vm/src/stdlib/pystruct.rs @@ -46,31 +46,19 @@ fn get_int(vm: &mut VirtualMachine, arg: &PyObjectRef) -> PyResult { objint::to_int(vm, arg, 10) } -fn pack_i8( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_i8(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { let v = get_int(vm, arg)?.to_i8().unwrap(); data.write_i8(v).unwrap(); Ok(()) } -fn pack_u8( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_u8(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { let v = get_int(vm, arg)?.to_u8().unwrap(); data.write_u8(v).unwrap(); Ok(()) } -fn pack_bool( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_bool(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { if objtype::isinstance(&arg, &vm.ctx.bool_type()) { let v = if objbool::get_value(arg) { 1 } else { 0 }; data.write_u8(v).unwrap(); @@ -80,71 +68,43 @@ fn pack_bool( } } -fn pack_i16( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_i16(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { let v = get_int(vm, arg)?.to_i16().unwrap(); data.write_i16::(v).unwrap(); Ok(()) } -fn pack_u16( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_u16(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { let v = get_int(vm, arg)?.to_u16().unwrap(); data.write_u16::(v).unwrap(); Ok(()) } -fn pack_i32( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_i32(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { let v = get_int(vm, arg)?.to_i32().unwrap(); data.write_i32::(v).unwrap(); Ok(()) } -fn pack_u32( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_u32(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { let v = get_int(vm, arg)?.to_u32().unwrap(); data.write_u32::(v).unwrap(); Ok(()) } -fn pack_i64( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_i64(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { let v = get_int(vm, arg)?.to_i64().unwrap(); data.write_i64::(v).unwrap(); Ok(()) } -fn pack_u64( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_u64(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { let v = get_int(vm, arg)?.to_u64().unwrap(); data.write_u64::(v).unwrap(); Ok(()) } -fn pack_f32( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_f32(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { if objtype::isinstance(&arg, &vm.ctx.float_type()) { let v = objfloat::get_value(arg) as f32; data.write_f32::(v).unwrap(); @@ -154,11 +114,7 @@ fn pack_f32( } } -fn pack_f64( - vm: &mut VirtualMachine, - arg: &PyObjectRef, - data: &mut Write, -) -> PyResult<()> { +fn pack_f64(vm: &mut VirtualMachine, arg: &PyObjectRef, data: &mut Write) -> PyResult<()> { if objtype::isinstance(&arg, &vm.ctx.float_type()) { let v = objfloat::get_value(arg) as f64; data.write_f64::(v).unwrap();