rebased code

sobolevn · sobolevn · commit 63db6d78b429 · 2021-09-15T10:35:27.000+03:00
diff --git a/derive/src/pyclass.rs b/derive/src/pyclass.rs
@@ -338,7 +338,7 @@ pub(crate) fn impl_define_exception(
                 cls: PyTypeRef,
                 args: FuncArgs,
                 vm: &VirtualMachine,
-            ) -> PyResult<PyBaseExceptionRef> {
+            ) -> PyResult {
                 #tp_new_slot
             }
 
diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs
@@ -155,12 +155,8 @@ impl PyBaseException {
     }
 }
 
-fn base_exception_new(
-    cls: PyTypeRef,
-    args: FuncArgs,
-    vm: &VirtualMachine,
-) -> PyResult<PyRef<PyBaseException>> {
-    PyBaseException::new(args.args, vm).into_ref_with_type(vm, cls)
+fn base_exception_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
+    PyBaseException::tp_new(cls, args, vm)
 }
 
 pub fn chain<T>(e1: PyResult<()>, e2: PyResult<T>) -> PyResult<T> {

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ pub(crate) fn impl_define_exception(`
`338`	`338`	`cls: PyTypeRef,`
`339`	`339`	`args: FuncArgs,`
`340`	`340`	`vm: &VirtualMachine,`
`341`		`- ) -> PyResult<PyBaseExceptionRef> {`
	`341`	`+ ) -> PyResult {`
`342`	`342`	`#tp_new_slot`
`343`	`343`	`}`
`344`	`344`
Original file line number	Diff line number	Diff line change
`@@ -155,12 +155,8 @@ impl PyBaseException {`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`		`-fn base_exception_new(`
`159`		`- cls: PyTypeRef,`
`160`		`- args: FuncArgs,`
`161`		`- vm: &VirtualMachine,`
`162`		`-) -> PyResult<PyRef<PyBaseException>> {`
`163`		`- PyBaseException::new(args.args, vm).into_ref_with_type(vm, cls)`
	`158`	`+fn base_exception_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {`
	`159`	`+ PyBaseException::tp_new(cls, args, vm)`
`164`	`160`	`}`
`165`	`161`
`166`	`162`	`pub fn chain<T>(e1: PyResult<()>, e2: PyResult<T>) -> PyResult<T> {`