RustPython · youknowone · Sep 29, 2021 · Sep 25, 2021 · Sep 29, 2021
diff --git a/derive/src/pyclass.rs b/derive/src/pyclass.rs
@@ -346,7 +346,7 @@ pub(crate) fn impl_define_exception(
 
             #[pymethod(magic)]
             pub(crate) fn init(
-                zelf: ::rustpython_vm::PyRef<::rustpython_vm::exceptions::PyBaseException>,
+                zelf: ::rustpython_vm::PyRef<::rustpython_vm::builtins::PyBaseException>,
                 args: ::rustpython_vm::function::FuncArgs,
                 vm: &::rustpython_vm::VirtualMachine,
             ) -> ::rustpython_vm::PyResult<()> {

diff --git a/src/shell.rs b/src/shell.rs
@@ -3,8 +3,9 @@ mod helper;
 use rustpython_parser::error::{LexicalErrorType, ParseErrorType};
 use rustpython_vm::readline::{Readline, ReadlineResult};
 use rustpython_vm::{
+    builtins::PyBaseExceptionRef,
     compile::{self, CompileError, CompileErrorType},
-    exceptions::{print_exception, PyBaseExceptionRef},
+    exceptions::print_exception,
     scope::Scope,
     PyResult, TypeProtocol, VirtualMachine,
 };

diff --git a/vm/src/builtins/asyncgenerator.rs b/vm/src/builtins/asyncgenerator.rs
@@ -1,7 +1,7 @@
 use super::{PyCode, PyStrRef, PyTypeRef};
 use crate::{
+    builtins::PyBaseExceptionRef,
     coroutine::{Coro, Variant},
-    exceptions::PyBaseExceptionRef,
     frame::FrameRef,
     function::OptionalArg,
     slots::{IteratorIterable, PyIter},

diff --git a/vm/src/builtins/dict.rs b/vm/src/builtins/dict.rs
@@ -1,8 +1,8 @@
 use super::{IterStatus, PySet, PyStrRef, PyTypeRef};
 use crate::{
+    builtins::PyBaseExceptionRef,
     common::ascii,
     dictdatatype::{self, DictKey},
-    exceptions::PyBaseExceptionRef,
     function::{ArgIterable, FuncArgs, KwArgs, OptionalArg},
     iterator,
     slots::{Comparable, Hashable, Iterable, IteratorIterable, PyComparisonOp, PyIter, Unhashable},

diff --git a/vm/src/builtins/function/jitfunc.rs b/vm/src/builtins/function/jitfunc.rs
@@ -1,12 +1,9 @@
-use crate::builtins::dict::PyDictRef;
-use crate::builtins::function::{PyFunction, PyFunctionRef};
-use crate::builtins::{float, int, pybool, PyStrRef};
-use crate::bytecode::CodeFlags;
-use crate::exceptions::PyBaseExceptionRef;
-use crate::function::FuncArgs;
-use crate::VirtualMachine;
 use crate::{
-    IdProtocol, IntoPyObject, ItemProtocol, PyObjectRef, PyResult, TryFromObject, TypeProtocol,
+    builtins::{float, int, pybool, PyBaseExceptionRef, PyDictRef, PyFunction, PyStrRef},
+    bytecode::CodeFlags,
+    function::FuncArgs,
+    IdProtocol, IntoPyObject, ItemProtocol, PyObjectRef, PyRef, PyResult, TryFromObject,
+    TypeProtocol, VirtualMachine,
 };
 use num_traits::ToPrimitive;
 use rustpython_jit::{AbiValue, Args, CompiledCode, JitArgumentError, JitType};
@@ -66,7 +63,7 @@ fn get_jit_arg_type(dict: &PyDictRef, name: &str, vm: &VirtualMachine) -> PyResu
     }
 }
 
-pub fn get_jit_arg_types(func: &PyFunctionRef, vm: &VirtualMachine) -> PyResult<Vec<JitType>> {
+pub fn get_jit_arg_types(func: &PyRef<PyFunction>, vm: &VirtualMachine) -> PyResult<Vec<JitType>> {
     let arg_names = func.code.arg_names();
 
     if func

diff --git a/vm/src/builtins/mod.rs b/vm/src/builtins/mod.rs
@@ -86,3 +86,5 @@ pub use int::try_to_float as try_bigint_to_f64;
 
 mod make_module;
 pub use make_module::{ascii, make_module, print};
+
+pub use crate::exceptions::types::*;
diff --git a/vm/src/builtins/singletons.rs b/vm/src/builtins/singletons.rs
@@ -1,13 +1,12 @@
 use super::PyTypeRef;
 use crate::{
-    slots::SlotConstructor, IntoPyObject, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult,
-    PyValue, TypeProtocol, VirtualMachine,
+    slots::SlotConstructor, IntoPyObject, PyClassImpl, PyContext, PyObjectRef, PyResult, PyValue,
+    TypeProtocol, VirtualMachine,
 };
 
 #[pyclass(module = false, name = "NoneType")]
 #[derive(Debug)]
 pub struct PyNone;
-pub type PyNoneRef = PyRef<PyNone>;
 
 impl PyValue for PyNone {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {

diff --git a/vm/src/codecs.rs b/vm/src/codecs.rs
@@ -1,13 +1,13 @@
+use crate::{
+    builtins::{PyBaseExceptionRef, PyBytesRef, PyStr, PyStrRef, PyTuple, PyTupleRef},
+    common::{ascii, lock::PyRwLock},
+    IntoPyObject, PyContext, PyObjectRef, PyResult, PyValue, TryFromObject, TypeProtocol,
+    VirtualMachine,
+};
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::ops::Range;
 
-use crate::builtins::{PyBytesRef, PyStr, PyStrRef, PyTuple, PyTupleRef};
-use crate::common::{ascii, lock::PyRwLock};
-use crate::exceptions::PyBaseExceptionRef;
-use crate::VirtualMachine;
-use crate::{IntoPyObject, PyContext, PyObjectRef, PyResult, PyValue, TryFromObject, TypeProtocol};
-
 pub struct CodecsRegistry {
     inner: PyRwLock<RegistryInner>,
 }

diff --git a/vm/src/coroutine.rs b/vm/src/coroutine.rs
@@ -1,10 +1,10 @@
-use crate::builtins::{PyStrRef, PyTypeRef};
-use crate::exceptions::{self, PyBaseExceptionRef};
-use crate::frame::{ExecutionResult, FrameRef};
-use crate::VirtualMachine;
-use crate::{PyObjectRef, PyResult, TypeProtocol};
-
-use crate::common::lock::PyMutex;
+use crate::{
+    builtins::{PyBaseExceptionRef, PyStrRef, PyTypeRef},
+    common::lock::PyMutex,
+    exceptions,
+    frame::{ExecutionResult, FrameRef},
+    PyObjectRef, PyResult, TypeProtocol, VirtualMachine,
+};
 use crossbeam_utils::atomic::AtomicCell;
 
 #[derive(Debug, PartialEq, Clone, Copy)]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -86,3 +86,5 @@ pub use int::try_to_float as try_bigint_to_f64;

		mod make_module;
		pub use make_module::{ascii, make_module, print};

		pub use crate::exceptions::types::*;