rust fmt

Author: rmliddle

vm/src/builtins.rs

@@ -14,11 +14,11 @@ use super::obj::objiter;
 use super::obj::objstr;
 use super::obj::objtype;
 
-use super::stdlib::io::io_open;
 use super::pyobject::{
     AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObject, PyObjectKind, PyObjectRef,
-    PyResult, Scope, TypeProtocol
+    PyResult, Scope, TypeProtocol,
 };
+use super::stdlib::io::io_open;
 
 use super::vm::VirtualMachine;
 use num_bigint::ToBigInt;
@@ -242,8 +242,7 @@ fn builtin_eval(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let scope = PyObject {
         kind: PyObjectKind::Scope { scope: scope_inner },
         typ: None,
-    }
-    .into_ref();
+    }.into_ref();
 
     // Run the source:
     vm.run_code_obj(code_obj.clone(), scope)
@@ -290,8 +289,7 @@ fn builtin_exec(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let scope = PyObject {
         kind: PyObjectKind::Scope { scope: scope_inner },
         typ: None,
-    }
-    .into_ref();
+    }.into_ref();
 
     // Run the code:
     vm.run_code_obj(code_obj, scope)

vm/src/obj/objbytearray.rs

@@ -7,10 +7,13 @@ use super::super::pyobject::{
 use super::objint;
 
 use super::super::vm::VirtualMachine;
-use super::objbytes::get_value;
+// use super::objbytes::get_value;
 use super::objtype;
+use num_bigint::ToBigInt;
 use num_traits::ToPrimitive;
-use num_bigint::{ToBigInt};
+
+use std::cell::Ref;
+use std::ops::Deref;
 
 // Binary data support
 
@@ -63,26 +66,20 @@ fn bytearray_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     } else {
         vec![]
     };
-
     Ok(PyObject::new(
-        PyObjectKind::Bytes { value: value },
+        PyObjectKind::ByteArray { value: value },
         cls.clone(),
     ))
 }
 
 fn bytesarray_len(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
-    arg_check!(
-        vm,
-        args,
-        required = [(a, Some(vm.ctx.bytearray_type()))]
-    );
+    arg_check!(vm, args, required = [(a, Some(vm.ctx.bytearray_type()))]);
 
     let byte_vec = get_value(a).to_vec();
     let value = byte_vec.len().to_bigint();
     Ok(vm.ctx.new_int(value.unwrap()))
 }
 
-
 fn bytearray_eq(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(
         vm,
@@ -98,6 +95,15 @@ fn bytearray_eq(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     Ok(vm.ctx.new_bool(result))
 }
 
+pub fn get_value<'a>(obj: &'a PyObjectRef) -> impl Deref<Target = Vec<u8>> + 'a {
+    Ref::map(obj.borrow(), |py_obj| {
+        if let PyObjectKind::ByteArray { ref value } = py_obj.kind {
+            value
+        } else {
+            panic!("Inner error getting int {:?}", obj);
+        }
+    })
+}
 /*
 fn bytearray_getitem(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(

vm/src/stdlib/mod.rs

@@ -3,14 +3,14 @@ pub mod io;
 mod json;
 mod keyword;
 mod math;
+mod os;
 mod pystruct;
 mod random;
 mod re;
 mod time_module;
 mod tokenize;
 mod types;
 mod weakref;
-mod os;
 use std::collections::HashMap;
 
 use super::pyobject::{PyContext, PyObjectRef};