Merge pull request RustPython#688 from RustPython/joey/pyobject-function-split

Move function items out of pyobject module

Author: OddCoincidence

vm/src/builtins.rs

@@ -7,6 +7,8 @@ use std::char;
 use std::io::{self, Write};
 use std::path::PathBuf;
 
+use num_traits::{Signed, ToPrimitive};
+
 use crate::compile;
 use crate::import::import_module;
 use crate::obj::objbool;
@@ -17,16 +19,15 @@ use crate::obj::objstr;
 use crate::obj::objtype;
 
 use crate::frame::Scope;
+use crate::function::PyFuncArgs;
 use crate::pyobject::{
-    AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol,
+    AttributeProtocol, IdProtocol, PyContext, PyObjectRef, PyResult, TypeProtocol,
 };
+use crate::vm::VirtualMachine;
 
 #[cfg(not(target_arch = "wasm32"))]
 use crate::stdlib::io::io_open;
 
-use crate::vm::VirtualMachine;
-use num_traits::{Signed, ToPrimitive};
-
 fn get_locals(vm: &mut VirtualMachine) -> PyObjectRef {
     let d = vm.new_dict();
     // TODO: implement dict_iter_items?

vm/src/exceptions.rs

@@ -1,8 +1,9 @@
+use crate::function::PyFuncArgs;
 use crate::obj::objsequence;
 use crate::obj::objstr;
 use crate::obj::objtype;
 use crate::pyobject::{
-    create_type, AttributeProtocol, PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol,
+    create_type, AttributeProtocol, PyContext, PyObjectRef, PyResult, TypeProtocol,
 };
 use crate::vm::VirtualMachine;
 

vm/src/frame.rs

@@ -8,6 +8,7 @@ use rustpython_parser::ast;
 
 use crate::builtins;
 use crate::bytecode;
+use crate::function::PyFuncArgs;
 use crate::obj::objbool;
 use crate::obj::objbuiltinfunc::PyBuiltinFunction;
 use crate::obj::objcode;
@@ -20,8 +21,8 @@ use crate::obj::objslice::PySlice;
 use crate::obj::objstr;
 use crate::obj::objtype;
 use crate::pyobject::{
-    AttributeProtocol, DictProtocol, IdProtocol, PyContext, PyFuncArgs, PyObjectRef, PyResult,
-    PyValue, TryFromObject, TypeProtocol,
+    AttributeProtocol, DictProtocol, IdProtocol, PyContext, PyObjectRef, PyResult, PyValue,
+    TryFromObject, TypeProtocol,
 };
 use crate::vm::VirtualMachine;