Merge pull request RustPython#516 from RustPython/joey/argcheck-objtype

windelbouwman · web-flow · commit 5bd2db817fc3 · 2019-02-21T20:49:14.000+01:00
Don't require objtype import to use arg_check! macro
diff --git a/vm/src/macros.rs b/vm/src/macros.rs
@@ -15,7 +15,7 @@ macro_rules! type_check {
         // None indicates that we have no type requirement (i.e. we accept any type)
         if let Some(expected_type) = $arg_type {
             let arg = &$args.args[$arg_count];
-            if !objtype::isinstance(arg, &expected_type) {
+            if !$crate::obj::objtype::isinstance(arg, &expected_type) {
                 let arg_typ = arg.typ();
                 let expected_type_name = $vm.to_pystr(&expected_type)?;
                 let actual_type = $vm.to_pystr(&arg_typ)?;
diff --git a/vm/src/obj/objcode.rs b/vm/src/obj/objcode.rs
@@ -2,7 +2,6 @@
 
 */
 
-use super::objtype;
 use crate::bytecode;
 use crate::pyobject::{
     IdProtocol, PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
diff --git a/vm/src/obj/objenumerate.rs b/vm/src/obj/objenumerate.rs
@@ -1,6 +1,5 @@
 use super::objint;
 use super::objiter;
-use super::objtype; // Required for arg_check! to use isinstance
 use crate::pyobject::{PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol};
 use crate::vm::VirtualMachine;
 use num_bigint::BigInt;
diff --git a/vm/src/obj/objfilter.rs b/vm/src/obj/objfilter.rs
@@ -1,6 +1,5 @@
 use super::objbool;
 use super::objiter;
-use super::objtype;
 use crate::pyobject::{
     IdProtocol, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol,
 };
diff --git a/vm/src/obj/objframe.rs b/vm/src/obj/objframe.rs
@@ -2,7 +2,6 @@
 
 */
 
-use super::objtype;
 use crate::frame::Frame;
 use crate::pyobject::{
     PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
diff --git a/vm/src/obj/objfunction.rs b/vm/src/obj/objfunction.rs
@@ -1,4 +1,3 @@
-use super::objtype;
 use crate::pyobject::{
     AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObjectPayload, PyResult, TypeProtocol,
 };
diff --git a/vm/src/obj/objgenerator.rs b/vm/src/obj/objgenerator.rs
@@ -2,7 +2,6 @@
  * The mythical generator.
  */
 
-use super::objtype;
 use crate::frame::{ExecutionResult, Frame};
 use crate::pyobject::{
     PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
diff --git a/vm/src/obj/objmap.rs b/vm/src/obj/objmap.rs
@@ -1,5 +1,4 @@
 use super::objiter;
-use super::objtype;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol};
 use crate::vm::VirtualMachine; // Required for arg_check! to use isinstance
 
diff --git a/vm/src/obj/objmemory.rs b/vm/src/obj/objmemory.rs
@@ -1,5 +1,3 @@
-use super::objtype;
-
 use crate::pyobject::{PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol};
 use crate::vm::VirtualMachine;
 
diff --git a/vm/src/obj/objnone.rs b/vm/src/obj/objnone.rs
@@ -1,4 +1,3 @@
-use super::objtype;
 use crate::pyobject::{PyContext, PyFuncArgs, PyResult, TypeProtocol};
 use crate::vm::VirtualMachine;
 
diff --git a/vm/src/obj/objproperty.rs b/vm/src/obj/objproperty.rs
@@ -2,7 +2,6 @@
 
 */
 
-use super::objtype;
 use crate::pyobject::{PyContext, PyFuncArgs, PyResult, TypeProtocol};
 use crate::vm::VirtualMachine;
 
diff --git a/vm/src/obj/objslice.rs b/vm/src/obj/objslice.rs
@@ -1,5 +1,4 @@
 use super::objint;
-use super::objtype; // Required for arg_check! to use isinstance
 use crate::pyobject::{
     PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
 };
diff --git a/vm/src/obj/objzip.rs b/vm/src/obj/objzip.rs
@@ -1,5 +1,4 @@
 use super::objiter;
-use super::objtype;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol};
 use crate::vm::VirtualMachine; // Required for arg_check! to use isinstance
 
diff --git a/vm/src/stdlib/ast.rs b/vm/src/stdlib/ast.rs
@@ -6,7 +6,7 @@
 extern crate rustpython_parser;
 
 use self::rustpython_parser::{ast, parser};
-use crate::obj::{objstr, objtype};
+use crate::obj::objstr;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
 use crate::VirtualMachine;
 use num_complex::Complex64;
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
@@ -17,7 +17,6 @@ use super::os;
 use crate::obj::objbytes;
 use crate::obj::objint;
 use crate::obj::objstr;
-use crate::obj::objtype;
 
 use crate::pyobject::{
     AttributeProtocol, BufferProtocol, PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef,
diff --git a/vm/src/stdlib/keyword.rs b/vm/src/stdlib/keyword.rs
@@ -4,7 +4,7 @@
 
 extern crate rustpython_parser;
 use self::rustpython_parser::lexer;
-use crate::obj::{objstr, objtype};
+use crate::obj::objstr;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
 use crate::VirtualMachine;
 
diff --git a/vm/src/stdlib/math.rs b/vm/src/stdlib/math.rs
@@ -3,7 +3,7 @@
  *
  */
 
-use crate::obj::{objfloat, objtype};
+use crate::obj::objfloat;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
 use crate::VirtualMachine;
 use statrs::function::erf::{erf, erfc};
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -10,7 +10,6 @@ use num_traits::cast::ToPrimitive;
 //custom imports
 use crate::obj::objint;
 use crate::obj::objstr;
-use crate::obj::objtype;
 // use crate::obj::objdict;
 
 use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
diff --git a/vm/src/stdlib/random.rs b/vm/src/stdlib/random.rs
@@ -2,7 +2,7 @@
 
 extern crate rand;
 
-use crate::obj::{objfloat, objtype};
+use crate::obj::objfloat;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
 use crate::stdlib::random::rand::distributions::{Distribution, Normal};
 use crate::VirtualMachine;
diff --git a/vm/src/stdlib/re.rs b/vm/src/stdlib/re.rs
@@ -8,7 +8,7 @@
 extern crate regex;
 use self::regex::Regex;
 
-use crate::obj::{objstr, objtype};
+use crate::obj::objstr;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
 use crate::VirtualMachine;
 
diff --git a/vm/src/stdlib/time_module.rs b/vm/src/stdlib/time_module.rs
@@ -1,6 +1,6 @@
 //! The python `time` module.
 
-use crate::obj::{objfloat, objtype};
+use crate::obj::objfloat;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
 use crate::VirtualMachine;
 use std::thread;
diff --git a/vm/src/stdlib/tokenize.rs b/vm/src/stdlib/tokenize.rs
@@ -7,7 +7,7 @@ use std::iter::FromIterator;
 
 use self::rustpython_parser::lexer;
 
-use crate::obj::{objstr, objtype};
+use crate::obj::objstr;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
 use crate::VirtualMachine;
 
diff --git a/vm/src/stdlib/weakref.rs b/vm/src/stdlib/weakref.rs
@@ -5,7 +5,6 @@
 //! - [rust weak struct](https://doc.rust-lang.org/std/rc/struct.Weak.html)
 //!
 
-use crate::obj::objtype;
 use crate::pyobject::{
     PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyObjectWeakRef, PyResult,
     TypeProtocol,
diff --git a/vm/src/sysmodule.rs b/vm/src/sysmodule.rs
@@ -1,4 +1,3 @@
-use crate::obj::objtype;
 use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol};
 use crate::vm::VirtualMachine;
 use std::rc::Rc;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use super::objtype;`
`2`	`1`	`use crate::pyobject::{`
`3`	`2`	`AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObjectPayload, PyResult, TypeProtocol,`
`4`	`3`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`use super::objiter;`
`2`		`-use super::objtype;`
`3`	`2`	`use crate::pyobject::{PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol};`
`4`	`3`	`use crate::vm::VirtualMachine; // Required for arg_check! to use isinstance`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-use super::objtype;`
`2`		`-`
`3`	`1`	`use crate::pyobject::{PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol};`
`4`	`2`	`use crate::vm::VirtualMachine;`
`5`	`3`