Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Separate Debug from PyPayload (#6320)

Browse Source
This commit is contained in:
Jeong, YunWon
2025-12-02 20:20:31 +09:00
committed by GitHub
parent bf8152b4b8
commit 563dc0fc9e
6 changed files with 98 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/vm/src/builtins/dict.rs
View File

@@ -751,7 +751,7 @@ impl ExactSizeIterator for DictIter<'_> {
#[pyclass]
trait DictView: PyPayload + PyClassDef + Iterable + Representable {
type ReverseIter: PyPayload;
type ReverseIter: PyPayload + std::fmt::Debug;
fn dict(&self) -> &PyDictRef;
fn item(vm: &VirtualMachine, key: PyObjectRef, value: PyObjectRef) -> PyObjectRef;

96
crates/vm/src/object/core.rs
View File

@@ -13,7 +13,7 @@
use super::{
PyAtomicRef,
ext::{AsObject, PyRefExact, PyResult},
payload::PyObjectPayload,
payload::PyPayload,
};
use crate::object::traverse::{MaybeTraverse, Traverse, TraverseFn};
use crate::object::traverse_object::PyObjVTable;
@@ -76,10 +76,10 @@ use std::{
#[derive(Debug)]
pub(super) struct Erased;
pub(super) unsafe fn drop_dealloc_obj<T: PyObjectPayload>(x: *mut PyObject) {
pub(super) unsafe fn drop_dealloc_obj<T: PyPayload>(x: *mut PyObject) {
drop(unsafe { Box::from_raw(x as *mut PyInner<T>) });
}
pub(super) unsafe fn debug_obj<T: PyObjectPayload>(
pub(super) unsafe fn debug_obj<T: PyPayload + std::fmt::Debug>(
x: &PyObject,
f: &mut fmt::Formatter<'_>,
) -> fmt::Result {
@@ -88,10 +88,7 @@ pub(super) unsafe fn debug_obj<T: PyObjectPayload>(
}
/// Call `try_trace` on payload
pub(super) unsafe fn try_trace_obj<T: PyObjectPayload>(
x: &PyObject,
tracer_fn: &mut TraverseFn<'_>,
) {
pub(super) unsafe fn try_trace_obj<T: PyPayload>(x: &PyObject, tracer_fn: &mut TraverseFn<'_>) {
let x = unsafe { &*(x as *const PyObject as *const PyInner<T>) };
let payload = &x.payload;
payload.try_traverse(tracer_fn)
@@ -441,7 +438,7 @@ impl InstanceDict {
}
}
impl<T: PyObjectPayload> PyInner<T> {
impl<T: PyPayload + std::fmt::Debug> PyInner<T> {
fn new(payload: T, typ: PyTypeRef, dict: Option<PyDictRef>) -> Box<Self> {
let member_count = typ.slots.member_count;
Box::new(Self {
@@ -531,7 +528,7 @@ impl PyObjectRef {
/// If the downcast fails, the original ref is returned in as `Err` so
/// another downcast can be attempted without unnecessary cloning.
#[inline(always)]
pub fn downcast<T: PyObjectPayload>(self) -> Result<PyRef<T>, Self> {
pub fn downcast<T: PyPayload>(self) -> Result<PyRef<T>, Self> {
if self.downcastable::<T>() {
Ok(unsafe { self.downcast_unchecked() })
} else {
@@ -539,7 +536,7 @@ impl PyObjectRef {
}
}
pub fn try_downcast<T: PyObjectPayload>(self, vm: &VirtualMachine) -> PyResult<PyRef<T>> {
pub fn try_downcast<T: PyPayload>(self, vm: &VirtualMachine) -> PyResult<PyRef<T>> {
T::try_downcast_from(&self, vm)?;
Ok(unsafe { self.downcast_unchecked() })
}
@@ -565,10 +562,7 @@ impl PyObjectRef {
/// If the downcast fails, the original ref is returned in as `Err` so
/// another downcast can be attempted without unnecessary cloning.
#[inline]
pub fn downcast_exact<T: PyObjectPayload + crate::PyPayload>(
self,
vm: &VirtualMachine,
) -> Result<PyRefExact<T>, Self> {
pub fn downcast_exact<T: PyPayload>(self, vm: &VirtualMachine) -> Result<PyRefExact<T>, Self> {
if self.class().is(T::class(&vm.ctx)) {
// TODO: is this always true?
assert!(
@@ -638,7 +632,7 @@ impl PyObject {
#[deprecated(note = "use downcastable instead")]
#[inline(always)]
pub fn payload_is<T: PyObjectPayload>(&self) -> bool {
pub fn payload_is<T: PyPayload>(&self) -> bool {
self.0.typeid == T::payload_type_id()
}
@@ -648,7 +642,7 @@ impl PyObject {
/// The actual payload type must be T.
#[deprecated(note = "use downcast_unchecked_ref instead")]
#[inline(always)]
pub const unsafe fn payload_unchecked<T: PyObjectPayload>(&self) -> &T {
pub const unsafe fn payload_unchecked<T: PyPayload>(&self) -> &T {
// we cast to a PyInner<T> first because we don't know T's exact offset because of
// varying alignment, but once we get a PyInner<T> the compiler can get it for us
let inner = unsafe { &*(&self.0 as *const PyInner<Erased> as *const PyInner<T>) };
@@ -657,7 +651,7 @@ impl PyObject {
#[deprecated(note = "use downcast_ref instead")]
#[inline(always)]
pub fn payload<T: PyObjectPayload>(&self) -> Option<&T> {
pub fn payload<T: PyPayload>(&self) -> Option<&T> {
#[allow(deprecated)]
if self.payload_is::<T>() {
#[allow(deprecated)]
@@ -678,10 +672,7 @@ impl PyObject {
#[deprecated(note = "use downcast_ref_if_exact instead")]
#[inline(always)]
pub fn payload_if_exact<T: PyObjectPayload + crate::PyPayload>(
&self,
vm: &VirtualMachine,
) -> Option<&T> {
pub fn payload_if_exact<T: PyPayload>(&self, vm: &VirtualMachine) -> Option<&T> {
if self.class().is(T::class(&vm.ctx)) {
#[allow(deprecated)]
self.payload()
@@ -730,12 +721,12 @@ impl PyObject {
/// Check if this object can be downcast to T.
#[inline(always)]
pub fn downcastable<T: PyObjectPayload>(&self) -> bool {
pub fn downcastable<T: PyPayload>(&self) -> bool {
T::downcastable_from(self)
}
/// Attempt to downcast this reference to a subclass.
pub fn try_downcast_ref<'a, T: PyObjectPayload>(
pub fn try_downcast_ref<'a, T: PyPayload>(
&'a self,
vm: &VirtualMachine,
) -> PyResult<&'a Py<T>> {
@@ -745,7 +736,7 @@ impl PyObject {
/// Attempt to downcast this reference to a subclass.
#[inline(always)]
pub fn downcast_ref<T: PyObjectPayload>(&self) -> Option<&Py<T>> {
pub fn downcast_ref<T: PyPayload>(&self) -> Option<&Py<T>> {
if self.downcastable::<T>() {
// SAFETY: just checked that the payload is T, and PyRef is repr(transparent) over
// PyObjectRef
@@ -756,10 +747,7 @@ impl PyObject {
}
#[inline(always)]
pub fn downcast_ref_if_exact<T: PyObjectPayload + crate::PyPayload>(
&self,
vm: &VirtualMachine,
) -> Option<&Py<T>> {
pub fn downcast_ref_if_exact<T: PyPayload>(&self, vm: &VirtualMachine) -> Option<&Py<T>> {
self.class()
.is(T::class(&vm.ctx))
.then(|| unsafe { self.downcast_unchecked_ref::<T>() })
@@ -768,7 +756,7 @@ impl PyObject {
/// # Safety
/// T must be the exact payload type
#[inline(always)]
pub unsafe fn downcast_unchecked_ref<T: PyObjectPayload>(&self) -> &Py<T> {
pub unsafe fn downcast_unchecked_ref<T: PyPayload>(&self) -> &Py<T> {
debug_assert!(self.downcastable::<T>());
// SAFETY: requirements forwarded from caller
unsafe { &*(self as *const Self as *const Py<T>) }
@@ -875,7 +863,7 @@ impl AsRef<PyObject> for PyObjectRef {
}
}
impl<'a, T: PyObjectPayload> From<&'a Py<T>> for &'a PyObject {
impl<'a, T: PyPayload> From<&'a Py<T>> for &'a PyObject {
#[inline(always)]
fn from(py_ref: &'a Py<T>) -> Self {
py_ref.as_object()
@@ -908,7 +896,7 @@ impl fmt::Debug for PyObjectRef {
#[repr(transparent)]
pub struct Py<T>(PyInner<T>);
impl<T: PyObjectPayload> Py<T> {
impl<T: PyPayload> Py<T> {
pub fn downgrade(
&self,
callback: Option<PyObjectRef>,
@@ -947,7 +935,7 @@ impl<T> Deref for Py<T> {
}
}
impl<T: PyObjectPayload> Borrow<PyObject> for Py<T> {
impl<T: PyPayload> Borrow<PyObject> for Py<T> {
#[inline(always)]
fn borrow(&self) -> &PyObject {
unsafe { &*(&self.0 as *const PyInner<T> as *const PyObject) }
@@ -956,7 +944,7 @@ impl<T: PyObjectPayload> Borrow<PyObject> for Py<T> {
impl<T> std::hash::Hash for Py<T>
where
T: std::hash::Hash + PyObjectPayload,
T: std::hash::Hash + PyPayload,
{
#[inline]
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
@@ -966,7 +954,7 @@ where
impl<T> PartialEq for Py<T>
where
T: PartialEq + PyObjectPayload,
T: PartialEq + PyPayload,
{
#[inline]
fn eq(&self, other: &Self) -> bool {
@@ -974,11 +962,11 @@ where
}
}
impl<T> Eq for Py<T> where T: Eq + PyObjectPayload {}
impl<T> Eq for Py<T> where T: Eq + PyPayload {}
impl<T> AsRef<PyObject> for Py<T>
where
T: PyObjectPayload,
T: PyPayload,
{
#[inline(always)]
fn as_ref(&self) -> &PyObject {
@@ -986,7 +974,7 @@ where
}
}
impl<T: PyObjectPayload> fmt::Debug for Py<T> {
impl<T: PyPayload + std::fmt::Debug> fmt::Debug for Py<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
(**self).fmt(f)
}
@@ -1035,7 +1023,7 @@ impl<T> Clone for PyRef<T> {
}
}
impl<T: PyObjectPayload> PyRef<T> {
impl<T: PyPayload> PyRef<T> {
// #[inline(always)]
// pub(crate) const fn into_non_null(self) -> NonNull<Py<T>> {
// let ptr = self.ptr;
@@ -1065,14 +1053,6 @@ impl<T: PyObjectPayload> PyRef<T> {
}
}
#[inline(always)]
pub fn new_ref(payload: T, typ: crate::builtins::PyTypeRef, dict: Option<PyDictRef>) -> Self {
let inner = Box::into_raw(PyInner::new(payload, typ, dict));
Self {
ptr: unsafe { NonNull::new_unchecked(inner.cast::<Py<T>>()) },
}
}
pub const fn leak(pyref: Self) -> &'static Py<T> {
let ptr = pyref.ptr;
std::mem::forget(pyref);
@@ -1080,9 +1060,19 @@ impl<T: PyObjectPayload> PyRef<T> {
}
}
impl<T: PyPayload + std::fmt::Debug> PyRef<T> {
#[inline(always)]
pub fn new_ref(payload: T, typ: crate::builtins::PyTypeRef, dict: Option<PyDictRef>) -> Self {
let inner = Box::into_raw(PyInner::new(payload, typ, dict));
Self {
ptr: unsafe { NonNull::new_unchecked(inner.cast::<Py<T>>()) },
}
}
}
impl<T> Borrow<PyObject> for PyRef<T>
where
T: PyObjectPayload,
T: PyPayload,
{
#[inline(always)]
fn borrow(&self) -> &PyObject {
@@ -1092,7 +1082,7 @@ where
impl<T> AsRef<PyObject> for PyRef<T>
where
T: PyObjectPayload,
T: PyPayload,
{
#[inline(always)]
fn as_ref(&self) -> &PyObject {
@@ -1133,7 +1123,7 @@ impl<T> Deref for PyRef<T> {
impl<T> std::hash::Hash for PyRef<T>
where
T: std::hash::Hash + PyObjectPayload,
T: std::hash::Hash + PyPayload,
{
#[inline]
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
@@ -1143,7 +1133,7 @@ where
impl<T> PartialEq for PyRef<T>
where
T: PartialEq + PyObjectPayload,
T: PartialEq + PyPayload,
{
#[inline]
fn eq(&self, other: &Self) -> bool {
@@ -1151,15 +1141,15 @@ where
}
}
impl<T> Eq for PyRef<T> where T: Eq + PyObjectPayload {}
impl<T> Eq for PyRef<T> where T: Eq + PyPayload {}
#[repr(transparent)]
pub struct PyWeakRef<T: PyObjectPayload> {
pub struct PyWeakRef<T: PyPayload> {
weak: PyRef<PyWeak>,
_marker: PhantomData<T>,
}
impl<T: PyObjectPayload> PyWeakRef<T> {
impl<T: PyPayload> PyWeakRef<T> {
pub fn upgrade(&self) -> Option<PyRef<T>> {
self.weak
.upgrade()

60
crates/vm/src/object/ext.rs
View File

@@ -1,6 +1,6 @@
use super::{
core::{Py, PyObject, PyObjectRef, PyRef},
payload::{PyObjectPayload, PyPayload},
payload::PyPayload,
};
use crate::common::{
atomic::{Ordering, PyAtomic, Radium},
@@ -41,7 +41,7 @@ pub type PyResult<T = PyObjectRef> = Result<T, PyBaseExceptionRef>; // A valid v
impl<T: fmt::Display> fmt::Display for PyRef<T>
where
T: PyObjectPayload + fmt::Display,
T: PyPayload + fmt::Display,
{
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt::Display::fmt(&**self, f)
@@ -50,7 +50,7 @@ where
impl<T: fmt::Display> fmt::Display for Py<T>
where
T: PyObjectPayload + fmt::Display,
T: PyPayload + fmt::Display,
{
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt::Display::fmt(&**self, f)
@@ -58,7 +58,7 @@ where
}
#[repr(transparent)]
pub struct PyExact<T: PyObjectPayload> {
pub struct PyExact<T> {
inner: Py<T>,
}
@@ -80,28 +80,28 @@ impl<T: PyPayload> Deref for PyExact<T> {
}
}
impl<T: PyObjectPayload> Borrow<PyObject> for PyExact<T> {
impl<T: PyPayload> Borrow<PyObject> for PyExact<T> {
#[inline(always)]
fn borrow(&self) -> &PyObject {
self.inner.borrow()
}
}
impl<T: PyObjectPayload> AsRef<PyObject> for PyExact<T> {
impl<T: PyPayload> AsRef<PyObject> for PyExact<T> {
#[inline(always)]
fn as_ref(&self) -> &PyObject {
self.inner.as_ref()
}
}
impl<T: PyObjectPayload> Borrow<Py<T>> for PyExact<T> {
impl<T: PyPayload> Borrow<Py<T>> for PyExact<T> {
#[inline(always)]
fn borrow(&self) -> &Py<T> {
&self.inner
}
}
impl<T: PyObjectPayload> AsRef<Py<T>> for PyExact<T> {
impl<T: PyPayload> AsRef<Py<T>> for PyExact<T> {
#[inline(always)]
fn as_ref(&self) -> &Py<T> {
&self.inner
@@ -134,11 +134,11 @@ impl<T: PyPayload> PyRef<T> {
/// PyRef but guaranteed not to be a subtype instance
#[derive(Debug)]
#[repr(transparent)]
pub struct PyRefExact<T: PyObjectPayload> {
pub struct PyRefExact<T: PyPayload> {
inner: PyRef<T>,
}
impl<T: PyObjectPayload> PyRefExact<T> {
impl<T: PyPayload> PyRefExact<T> {
/// # Safety
/// obj must have exact type for the payload
pub const unsafe fn new_unchecked(obj: PyRef<T>) -> Self {
@@ -150,7 +150,7 @@ impl<T: PyObjectPayload> PyRefExact<T> {
}
}
impl<T: PyObjectPayload> Clone for PyRefExact<T> {
impl<T: PyPayload> Clone for PyRefExact<T> {
fn clone(&self) -> Self {
let inner = self.inner.clone();
Self { inner }
@@ -191,28 +191,28 @@ impl<T: PyPayload> Deref for PyRefExact<T> {
}
}
impl<T: PyObjectPayload> Borrow<PyObject> for PyRefExact<T> {
impl<T: PyPayload> Borrow<PyObject> for PyRefExact<T> {
#[inline(always)]
fn borrow(&self) -> &PyObject {
self.inner.borrow()
}
}
impl<T: PyObjectPayload> AsRef<PyObject> for PyRefExact<T> {
impl<T: PyPayload> AsRef<PyObject> for PyRefExact<T> {
#[inline(always)]
fn as_ref(&self) -> &PyObject {
self.inner.as_ref()
}
}
impl<T: PyObjectPayload> Borrow<Py<T>> for PyRefExact<T> {
impl<T: PyPayload> Borrow<Py<T>> for PyRefExact<T> {
#[inline(always)]
fn borrow(&self) -> &Py<T> {
self.inner.borrow()
}
}
impl<T: PyObjectPayload> AsRef<Py<T>> for PyRefExact<T> {
impl<T: PyPayload> AsRef<Py<T>> for PyRefExact<T> {
#[inline(always)]
fn as_ref(&self) -> &Py<T> {
self.inner.as_ref()
@@ -260,10 +260,10 @@ impl<T> Drop for PyAtomicRef<T> {
cfg_if::cfg_if! {
if #[cfg(feature = "threading")] {
unsafe impl<T: Send + PyObjectPayload> Send for PyAtomicRef<T> {}
unsafe impl<T: Sync + PyObjectPayload> Sync for PyAtomicRef<T> {}
unsafe impl<T: Send + PyObjectPayload> Send for PyAtomicRef<Option<T>> {}
unsafe impl<T: Sync + PyObjectPayload> Sync for PyAtomicRef<Option<T>> {}
unsafe impl<T: Send + PyPayload> Send for PyAtomicRef<T> {}
unsafe impl<T: Sync + PyPayload> Sync for PyAtomicRef<T> {}
unsafe impl<T: Send + PyPayload> Send for PyAtomicRef<Option<T>> {}
unsafe impl<T: Sync + PyPayload> Sync for PyAtomicRef<Option<T>> {}
unsafe impl Send for PyAtomicRef<PyObject> {}
unsafe impl Sync for PyAtomicRef<PyObject> {}
unsafe impl Send for PyAtomicRef<Option<PyObject>> {}
@@ -285,7 +285,7 @@ impl<T: fmt::Debug> fmt::Debug for PyAtomicRef<T> {
}
}
impl<T: PyObjectPayload> From<PyRef<T>> for PyAtomicRef<T> {
impl<T: PyPayload> From<PyRef<T>> for PyAtomicRef<T> {
fn from(pyref: PyRef<T>) -> Self {
let py = PyRef::leak(pyref);
Self {
@@ -295,7 +295,7 @@ impl<T: PyObjectPayload> From<PyRef<T>> for PyAtomicRef<T> {
}
}
impl<T: PyObjectPayload> Deref for PyAtomicRef<T> {
impl<T: PyPayload> Deref for PyAtomicRef<T> {
type Target = Py<T>;
fn deref(&self) -> &Self::Target {
@@ -309,7 +309,7 @@ impl<T: PyObjectPayload> Deref for PyAtomicRef<T> {
}
}
impl<T: PyObjectPayload> PyAtomicRef<T> {
impl<T: PyPayload> PyAtomicRef<T> {
/// # Safety
/// The caller is responsible to keep the returned PyRef alive
/// until no more reference can be used via PyAtomicRef::deref()
@@ -328,7 +328,7 @@ impl<T: PyObjectPayload> PyAtomicRef<T> {
}
}
impl<T: PyObjectPayload> From<Option<PyRef<T>>> for PyAtomicRef<Option<T>> {
impl<T: PyPayload> From<Option<PyRef<T>>> for PyAtomicRef<Option<T>> {
fn from(opt_ref: Option<PyRef<T>>) -> Self {
let val = opt_ref
.map(|x| PyRef::leak(x) as *const Py<T> as *mut _)
@@ -340,7 +340,7 @@ impl<T: PyObjectPayload> From<Option<PyRef<T>>> for PyAtomicRef<Option<T>> {
}
}
impl<T: PyObjectPayload> PyAtomicRef<Option<T>> {
impl<T: PyPayload> PyAtomicRef<Option<T>> {
pub fn deref(&self) -> Option<&Py<T>> {
unsafe { self.inner.load(Ordering::Relaxed).cast::<Py<T>>().as_ref() }
}
@@ -521,25 +521,25 @@ impl PyObject {
/// `PyObjectRef`, which isn't that cheap as that increments the atomic reference counter.
// TODO: check if we still need this
#[allow(dead_code)]
pub struct PyLease<'a, T: PyObjectPayload> {
pub struct PyLease<'a, T: PyPayload> {
inner: PyRwLockReadGuard<'a, PyRef<T>>,
}
impl<T: PyObjectPayload + PyPayload> PyLease<'_, T> {
impl<T: PyPayload> PyLease<'_, T> {
#[inline(always)]
pub fn into_owned(self) -> PyRef<T> {
self.inner.clone()
}
}
impl<T: PyObjectPayload + PyPayload> Borrow<PyObject> for PyLease<'_, T> {
impl<T: PyPayload> Borrow<PyObject> for PyLease<'_, T> {
#[inline(always)]
fn borrow(&self) -> &PyObject {
self.inner.as_ref()
}
}
impl<T: PyObjectPayload + PyPayload> Deref for PyLease<'_, T> {
impl<T: PyPayload> Deref for PyLease<'_, T> {
type Target = PyRef<T>;
#[inline(always)]
fn deref(&self) -> &Self::Target {
@@ -556,7 +556,7 @@ where
}
}
impl<T: PyObjectPayload> ToPyObject for PyRef<T> {
impl<T: PyPayload> ToPyObject for PyRef<T> {
#[inline(always)]
fn to_pyobject(self, _vm: &VirtualMachine) -> PyObjectRef {
self.into()
@@ -581,7 +581,7 @@ impl ToPyObject for &PyObject {
// explicitly implementing `ToPyObject`.
impl<T> ToPyObject for T
where
T: PyPayload + Sized,
T: PyPayload + std::fmt::Debug + Sized,
{
#[inline(always)]
fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef {

31
crates/vm/src/object/payload.rs
View File

@@ -16,9 +16,7 @@ cfg_if::cfg_if! {
}
}
pub trait PyPayload:
std::fmt::Debug + MaybeTraverse + PyThreadingConstraint + Sized + 'static
{
pub trait PyPayload: MaybeTraverse + PyThreadingConstraint + Sized + 'static {
#[inline]
fn payload_type_id() -> std::any::TypeId {
std::any::TypeId::of::<Self>()
@@ -51,12 +49,18 @@ pub trait PyPayload:
fn class(ctx: &Context) -> &'static Py<PyType>;
#[inline]
fn into_pyobject(self, vm: &VirtualMachine) -> PyObjectRef {
fn into_pyobject(self, vm: &VirtualMachine) -> PyObjectRef
where
Self: std::fmt::Debug,
{
self.into_ref(&vm.ctx).into()
}
#[inline]
fn _into_ref(self, cls: PyTypeRef, ctx: &Context) -> PyRef<Self> {
fn _into_ref(self, cls: PyTypeRef, ctx: &Context) -> PyRef<Self>
where
Self: std::fmt::Debug,
{
let dict = if cls.slots.flags.has_feature(PyTypeFlags::HAS_DICT) {
Some(ctx.new_dict())
} else {
@@ -66,7 +70,10 @@ pub trait PyPayload:
}
#[inline]
fn into_exact_ref(self, ctx: &Context) -> PyRefExact<Self> {
fn into_exact_ref(self, ctx: &Context) -> PyRefExact<Self>
where
Self: std::fmt::Debug,
{
unsafe {
// Self::into_ref() always returns exact typed PyRef
PyRefExact::new_unchecked(self.into_ref(ctx))
@@ -74,13 +81,19 @@ pub trait PyPayload:
}
#[inline]
fn into_ref(self, ctx: &Context) -> PyRef<Self> {
fn into_ref(self, ctx: &Context) -> PyRef<Self>
where
Self: std::fmt::Debug,
{
let cls = Self::class(ctx);
self._into_ref(cls.to_owned(), ctx)
}
#[inline]
fn into_ref_with_type(self, vm: &VirtualMachine, cls: PyTypeRef) -> PyResult<PyRef<Self>> {
fn into_ref_with_type(self, vm: &VirtualMachine, cls: PyTypeRef) -> PyResult<PyRef<Self>>
where
Self: std::fmt::Debug,
{
let exact_class = Self::class(&vm.ctx);
if cls.fast_issubclass(exact_class) {
Ok(self._into_ref(cls, &vm.ctx))
@@ -108,7 +121,7 @@ pub trait PyObjectPayload:
{
}
impl<T: PyPayload + 'static> PyObjectPayload for T {}
impl<T: PyPayload + std::fmt::Debug + 'static> PyObjectPayload for T {}
pub trait SlotOffset {
fn offset() -> usize;

2
crates/vm/src/types/slot.rs
View File

@@ -793,7 +793,7 @@ pub trait Constructor: PyPayload {
fn py_new(cls: PyTypeRef, args: Self::Args, vm: &VirtualMachine) -> PyResult;
}
pub trait DefaultConstructor: PyPayload + Default {
pub trait DefaultConstructor: PyPayload + Default + std::fmt::Debug {
fn construct_and_init(args: Self::Args, vm: &VirtualMachine) -> PyResult<PyRef<Self>>
where
Self: Initializer,

2
crates/vm/src/vm/context.rs
View File

@@ -380,7 +380,7 @@ impl Context {
pub fn new_pyref<T, P>(&self, value: T) -> PyRef<P>
where
T: Into<P>,
P: PyPayload,
P: PyPayload + std::fmt::Debug,
{
value.into().into_ref(self)
}