PyPayload::payload_type_of

Author: youknowone

vm/src/object/core.rs

@@ -655,7 +655,7 @@ impl PyObject {
 
     #[inline(always)]
     pub fn payload_is<T: PyObjectPayload>(&self) -> bool {
-        self.0.typeid == TypeId::of::<T>()
+        self.0.typeid == T::payload_type_id()
     }
 
     /// Force to return payload as T.

vm/src/object/payload.rs

@@ -19,6 +19,10 @@ cfg_if::cfg_if! {
 pub trait PyPayload:
     std::fmt::Debug + MaybeTraverse + PyThreadingConstraint + Sized + 'static
 {
+    #[inline]
+    fn payload_type_id() -> std::any::TypeId {
+        std::any::TypeId::of::<Self>()
+    }
     fn class(ctx: &Context) -> &'static Py<PyType>;
 
     #[inline]
@@ -75,7 +79,7 @@ pub trait PyPayload:
 }
 
 pub trait PyObjectPayload:
-    std::any::Any + std::fmt::Debug + MaybeTraverse + PyThreadingConstraint + 'static
+    PyPayload + std::any::Any + std::fmt::Debug + MaybeTraverse + PyThreadingConstraint + 'static
 {
 }