mirrors/RustPython
0
0 Fork 0
mirror of https://github.com/RustPython/RustPython.git synced 2026-10-29 11:14:38 +08:00
Code Activity

Fix build (rustfmt)

Browse Source
This commit is contained in:
Joey Hain committed 2019-03-02 13:25:42 -08:00
1 parent b98926a0fb
commit 4558dbf210
3 files changed
+13 -64
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

vm/src/obj/objcode.rs
+1 -4
View File
@@ -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<bytecode::CodeObject> {
fn member_code_obj(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult<bytecode::CodeObject> {
arg_check!(
vm,
args,
vm/src/obj/objint.rs
+1 -5
View File
@@ -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<IntType> {
pub fn to_int(vm: &mut VirtualMachine, obj: &PyObjectRef, base: u32) -> PyResult<IntType> {
let val = if objtype::isinstance(obj, &vm.ctx.int_type()) {
get_value(obj)
} else if objtype::isinstance(obj, &vm.ctx.float_type()) {
vm/src/stdlib/pystruct.rs
+11 -55
View File
@@ -46,31 +46,19 @@ fn get_int(vm: &mut VirtualMachine, arg: &PyObjectRef) -> PyResult<BigInt> {
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::<LittleEndian>(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::<LittleEndian>(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::<LittleEndian>(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::<LittleEndian>(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::<LittleEndian>(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::<LittleEndian>(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::<LittleEndian>(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::<LittleEndian>(v).unwrap();