Remove DerefToPyType

youknowone · youknowone · commit 7edebbf28cf3 · 2022-04-17T10:16:31.000+09:00
diff --git a/vm/src/builtins/pytype.rs b/vm/src/builtins/pytype.rs
@@ -12,8 +12,8 @@ use crate::{
     pyclass::{PyClassImpl, StaticType},
     pyobject::PyLease,
     types::{Callable, GetAttr, PyTypeFlags, PyTypeSlots, SetAttr},
-    IdProtocol, PyContext, PyObject, PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue,
-    TypeProtocol, VirtualMachine,
+    IdProtocol, PyContext, PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, TypeProtocol,
+    VirtualMachine,
 };
 use itertools::Itertools;
 use std::{
@@ -209,8 +209,11 @@ impl PyType {
 }
 
 impl PyTypeRef {
+    /// Determines if `subclass` is actually a subclass of `cls`, this doesn't call __subclasscheck__,
+    /// so only use this if `cls` is known to have not overridden the base __subclasscheck__ magic
+    /// method.
     pub fn issubclass(&self, cls: &impl Borrow<crate::PyObject>) -> bool {
-        self._issubclass(cls)
+        self.as_object().is(cls.borrow()) || self.mro.iter().any(|c| c.is(cls.borrow()))
     }
 
     pub fn iter_mro(&self) -> impl Iterator<Item = &PyTypeRef> + DoubleEndedIterator {
@@ -788,36 +791,6 @@ pub(crate) fn init(ctx: &PyContext) {
     PyType::extend_class(ctx, &ctx.types.type_type);
 }
 
-impl PyLease<'_, PyType> {
-    pub fn issubclass(&self, cls: &impl Borrow<crate::PyObject>) -> bool {
-        self._issubclass(cls)
-    }
-}
-
-pub trait DerefToPyType: Borrow<PyObject> {
-    fn deref_to_type(&self) -> &PyType;
-
-    /// Determines if `subclass` is actually a subclass of `cls`, this doesn't call __subclasscheck__,
-    /// so only use this if `cls` is known to have not overridden the base __subclasscheck__ magic
-    /// method.
-    fn _issubclass(&self, cls: &impl Borrow<crate::PyObject>) -> bool {
-        self.borrow().is(cls.borrow())
-            || self.deref_to_type().mro.iter().any(|c| c.is(cls.borrow()))
-    }
-}
-
-impl DerefToPyType for PyTypeRef {
-    fn deref_to_type(&self) -> &PyType {
-        self.deref()
-    }
-}
-
-impl<'a> DerefToPyType for PyLease<'a, PyType> {
-    fn deref_to_type(&self) -> &PyType {
-        self.deref()
-    }
-}
-
 pub(crate) fn call_slot_new(
     typ: PyTypeRef,
     subtype: PyTypeRef,
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -1,7 +1,7 @@
 pub use crate::_pyobjectrc::{
     PyObject, PyObjectRef, PyObjectView, PyObjectWeak, PyObjectWrap, PyRef, PyWeakRef,
 };
-use crate::common::{lock::PyRwLockReadGuard, rc::PyRc};
+use crate::common::lock::PyRwLockReadGuard;
 use crate::{
     builtins::{
         builtinfunc::{PyBuiltinFunction, PyBuiltinMethod, PyNativeFuncDef},
@@ -445,7 +445,7 @@ impl<'a, T: PyObjectPayload + PyValue> PyLease<'a, T> {
 
 impl<'a, T: PyObjectPayload + PyValue> Borrow<PyObject> for PyLease<'a, T> {
     fn borrow(&self) -> &PyObject {
-        self.inner.as_object()
+        self.inner.as_ref()
     }
 }
 
diff --git a/vm/src/pyobjectrc.rs b/vm/src/pyobjectrc.rs
@@ -466,11 +466,11 @@ impl ToOwned for PyObject {
 
 pub trait PyObjectWrap
 where
-    Self: Borrow<PyObject> + AsRef<PyObject>,
+    Self: Borrow<PyObject>,
 {
     #[inline(always)]
     fn as_object(&self) -> &PyObject {
-        self.as_ref()
+        self.borrow()
     }
 
     fn into_object(self) -> PyObjectRef;
@@ -986,28 +986,28 @@ where
     T: PyObjectPayload,
 {
     fn borrow(&self) -> &PyObject {
-        self.as_object()
+        (**self).as_object()
     }
 }
 
-impl<T> PyObjectWrap for PyRef<T>
+impl<T> AsRef<PyObject> for PyRef<T>
 where
     T: PyObjectPayload,
 {
-    #[inline]
-    fn into_object(self) -> PyObjectRef {
-        let me = ManuallyDrop::new(self);
-        PyObjectRef { ptr: me.ptr.cast() }
+    #[inline(always)]
+    fn as_ref(&self) -> &PyObject {
+        self.borrow()
     }
 }
 
-impl<T> AsRef<PyObject> for PyRef<T>
+impl<T> PyObjectWrap for PyRef<T>
 where
     T: PyObjectPayload,
 {
-    #[inline(always)]
-    fn as_ref(&self) -> &PyObject {
-        (**self).as_object()
+    #[inline]
+    fn into_object(self) -> PyObjectRef {
+        let me = ManuallyDrop::new(self);
+        PyObjectRef { ptr: me.ptr.cast() }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -466,11 +466,11 @@ impl ToOwned for PyObject {`
`466`	`466`
`467`	`467`	`pub trait PyObjectWrap`
`468`	`468`	`where`
`469`		`- Self: Borrow<PyObject> + AsRef<PyObject>,`
	`469`	`+ Self: Borrow<PyObject>,`
`470`	`470`	`{`
`471`	`471`	`#[inline(always)]`
`472`	`472`	`fn as_object(&self) -> &PyObject {`
`473`		`- self.as_ref()`
	`473`	`+ self.borrow()`
`474`	`474`	`}`
`475`	`475`
`476`	`476`	`fn into_object(self) -> PyObjectRef;`
`@@ -986,28 +986,28 @@ where`
`986`	`986`	`T: PyObjectPayload,`
`987`	`987`	`{`
`988`	`988`	`fn borrow(&self) -> &PyObject {`
`989`		`- self.as_object()`
	`989`	`+ (**self).as_object()`
`990`	`990`	`}`
`991`	`991`	`}`
`992`	`992`
`993`		`-impl<T> PyObjectWrap for PyRef<T>`
	`993`	`+impl<T> AsRef<PyObject> for PyRef<T>`
`994`	`994`	`where`
`995`	`995`	`T: PyObjectPayload,`
`996`	`996`	`{`
`997`		`- #[inline]`
`998`		`- fn into_object(self) -> PyObjectRef {`
`999`		`- let me = ManuallyDrop::new(self);`
`1000`		`- PyObjectRef { ptr: me.ptr.cast() }`
	`997`	`+ #[inline(always)]`
	`998`	`+ fn as_ref(&self) -> &PyObject {`
	`999`	`+ self.borrow()`
`1001`	`1000`	`}`
`1002`	`1001`	`}`
`1003`	`1002`
`1004`		`-impl<T> AsRef<PyObject> for PyRef<T>`
	`1003`	`+impl<T> PyObjectWrap for PyRef<T>`
`1005`	`1004`	`where`
`1006`	`1005`	`T: PyObjectPayload,`
`1007`	`1006`	`{`
`1008`		`- #[inline(always)]`
`1009`		`- fn as_ref(&self) -> &PyObject {`
`1010`		`- (**self).as_object()`
	`1007`	`+ #[inline]`
	`1008`	`+ fn into_object(self) -> PyObjectRef {`
	`1009`	`+ let me = ManuallyDrop::new(self);`
	`1010`	`+ PyObjectRef { ptr: me.ptr.cast() }`
`1011`	`1011`	`}`
`1012`	`1012`	`}`
`1013`	`1013`