Add PyObjectRc::into_ref()

Author: youknowone

vm/src/pyobject.rs

@@ -1187,15 +1187,6 @@ pub trait PyValue: fmt::Debug + PyThreadingConstraint + Sized + 'static {
     }
 }
 
-impl<T> PyValue for std::mem::MaybeUninit<T>
-where
-    T: PyValue,
-{
-    fn class(vm: &VirtualMachine) -> PyClassRef {
-        T::class(vm)
-    }
-}
-
 pub trait BorrowValue<'a>: PyValue {
     type Borrowed: 'a + Deref;
     fn borrow_value(&'a self) -> Self::Borrowed;

vm/src/pyobjectrc.rs

@@ -7,22 +7,53 @@ use std::ops::Deref;
 pub struct PyObjectRc<T = dyn PyObjectPayload>
 where
     T: ?Sized + PyObjectPayload,
+    PyRc<PyObject<T>>: AsPyObjectRef,
 {
     inner: PyRc<PyObject<T>>,
 }
 
 pub type PyObjectWeak<T = dyn PyObjectPayload> = PyWeak<PyObject<T>>;
 
+pub trait AsPyObjectRef {
+    fn _as_ref(self) -> PyRc<PyObject<dyn PyObjectPayload>>;
+}
+
+impl<T> AsPyObjectRef for PyRc<PyObject<T>>
+where
+    T: PyObjectPayload,
+{
+    fn _as_ref(self) -> PyRc<PyObject<dyn PyObjectPayload>> {
+        self
+    }
+}
+
+impl AsPyObjectRef for PyRc<PyObject<dyn PyObjectPayload>> {
+    fn _as_ref(self) -> PyRc<PyObject<dyn PyObjectPayload>> {
+        self
+    }
+}
+
 impl<T> PyObjectRc<T>
 where
     T: ?Sized + PyObjectPayload,
+    PyRc<PyObject<T>>: AsPyObjectRef,
 {
     pub fn into_raw(this: Self) -> *const PyObject<T> {
         let ptr = PyRc::as_ptr(&this.inner);
         std::mem::forget(this);
         ptr
     }
 
+    unsafe fn into_rc(this: Self) -> PyRc<PyObject<T>> {
+        std::mem::transmute(this)
+    }
+
+    pub fn into_ref(this: Self) -> PyObjectRc<dyn PyObjectPayload> {
+        PyObjectRc::<dyn PyObjectPayload> {
+            inner: unsafe { Self::into_rc(this) }._as_ref(),
+        }
+    }
+
     /// # Safety
     /// See PyRc::from_raw
     pub unsafe fn from_raw(ptr: *const PyObject<T>) -> Self {
@@ -58,13 +89,24 @@ where
 }
 
 #[cfg(feature = "threading")]
-unsafe impl<T> Send for PyObjectRc<T> where T: ?Sized + PyObjectPayload {}
+unsafe impl<T> Send for PyObjectRc<T>
+where
+    T: ?Sized + PyObjectPayload,
+    PyRc<PyObject<T>>: AsPyObjectRef,
+{
+}
 #[cfg(feature = "threading")]
-unsafe impl<T> Sync for PyObjectRc<T> where T: ?Sized + PyObjectPayload {}
+unsafe impl<T> Sync for PyObjectRc<T>
+where
+    T: ?Sized + PyObjectPayload,
+    PyRc<PyObject<T>>: AsPyObjectRef,
+{
+}
 
 impl<T> Deref for PyObjectRc<T>
 where
     T: ?Sized + PyObjectPayload,
+    PyRc<PyObject<T>>: AsPyObjectRef,
 {
     type Target = PyObject<T>;
 
@@ -77,6 +119,7 @@ where
 impl<T> Clone for PyObjectRc<T>
 where
     T: ?Sized + PyObjectPayload,
+    PyRc<PyObject<T>>: AsPyObjectRef,
 {
     fn clone(&self) -> Self {
         PyObjectRc {
@@ -88,6 +131,7 @@ where
 impl<T> fmt::Display for PyObjectRc<T>
 where
     T: ?Sized + PyObjectPayload,
+    PyRc<PyObject<T>>: AsPyObjectRef,
     PyObject<T>: fmt::Display,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -98,6 +142,7 @@ where
 impl<T> fmt::Debug for PyObjectRc<T>
 where
     T: ?Sized + PyObjectPayload,
+    PyRc<PyObject<T>>: AsPyObjectRef,
     PyObject<T>: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -108,6 +153,7 @@ where
 impl<T> fmt::Pointer for PyObjectRc<T>
 where
     T: ?Sized + PyObjectPayload,
+    PyRc<PyObject<T>>: AsPyObjectRef,
     PyObject<T>: fmt::Pointer,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -118,7 +164,7 @@ where
 impl<T> borrow::Borrow<T> for PyObjectRc<T>
 where
     T: ?Sized + PyObjectPayload,
-    PyRc<PyObject<T>>: borrow::Borrow<T>,
+    PyRc<PyObject<T>>: AsPyObjectRef + borrow::Borrow<T>,
 {
     fn borrow(&self) -> &T {
         self.inner.borrow()
@@ -128,7 +174,7 @@ where
 impl<T> AsRef<T> for PyObjectRc<T>
 where
     T: ?Sized + PyObjectPayload,
-    PyRc<PyObject<T>>: AsRef<T>,
+    PyRc<PyObject<T>>: AsPyObjectRef + AsRef<T>,
 {
     fn as_ref(&self) -> &T {
         self.inner.as_ref()