PyObjectRc derefs to PyObject instead of PyRc

Author: youknowone

vm/src/pyobject.rs

@@ -35,7 +35,7 @@ use crate::obj::objstaticmethod::PyStaticMethod;
 use crate::obj::objstr;
 use crate::obj::objtuple::{PyTuple, PyTupleRef};
 use crate::obj::objtype::{self, PyClass, PyClassRef};
-pub use crate::pyobjectrc::PyObjectRc;
+pub use crate::pyobjectrc::{PyObjectRc, PyObjectWeak};
 use crate::scope::Scope;
 use crate::slots::{PyClassSlots, PyTpFlags};
 use crate::types::{create_type, create_type_with_slots, initialize_types, TypeZoo};

vm/src/pyobjectrc.rs

@@ -66,11 +66,11 @@ impl<T> Deref for PyObjectRc<T>
 where
     T: ?Sized + PyObjectPayload,
 {
-    type Target = PyRc<PyObject<T>>;
+    type Target = PyObject<T>;
 
     #[inline]
-    fn deref(&self) -> &PyRc<PyObject<T>> {
-        &self.inner
+    fn deref(&self) -> &PyObject<T> {
+        self.inner.deref()
     }
 }
 
@@ -125,16 +125,6 @@ where
     }
 }
 
-impl<T> borrow::Borrow<PyRc<PyObject<T>>> for PyObjectRc<T>
-where
-    T: ?Sized + PyObjectPayload,
-    PyRc<PyObject<T>>: borrow::Borrow<PyRc<PyObject<T>>>,
-{
-    fn borrow(&self) -> &PyRc<PyObject<T>> {
-        &self.inner
-    }
-}
-
 impl<T> AsRef<T> for PyObjectRc<T>
 where
     T: ?Sized + PyObjectPayload,

vm/src/stdlib/itertools.rs

@@ -9,16 +9,16 @@ mod decl {
     use std::iter;
 
     use crate::common::cell::{PyMutex, PyRwLock, PyRwLockWriteGuard};
-    use crate::common::rc::{PyRc, PyWeak};
+    use crate::common::rc::PyRc;
     use crate::function::{Args, OptionalArg, OptionalOption, PyFuncArgs};
     use crate::obj::objbool;
     use crate::obj::objint::{self, PyInt, PyIntRef};
     use crate::obj::objiter::{call_next, get_all, get_iter, get_next_object, new_stop_iteration};
     use crate::obj::objtuple::PyTuple;
     use crate::obj::objtype::{self, PyClassRef};
     use crate::pyobject::{
-        BorrowValue, IdProtocol, IntoPyRef, PyCallable, PyClassImpl, PyObject, PyObjectRef, PyRef,
-        PyResult, PyValue, TypeProtocol,
+        BorrowValue, IdProtocol, IntoPyRef, PyCallable, PyClassImpl, PyObjectRc, PyObjectRef,
+        PyObjectWeak, PyRef, PyResult, PyValue, TypeProtocol,
     };
     use crate::vm::VirtualMachine;
 
@@ -498,7 +498,7 @@ mod decl {
         current_value: Option<PyObjectRef>,
         current_key: Option<PyObjectRef>,
         next_group: bool,
-        grouper: Option<PyWeak<PyObject<PyItertoolsGrouper>>>,
+        grouper: Option<PyObjectWeak<PyItertoolsGrouper>>,
     }
 
     impl fmt::Debug for GroupByState {
@@ -609,7 +609,7 @@ mod decl {
             }
             .into_ref(vm);
 
-            state.grouper = Some(PyRc::downgrade(&grouper.clone().into_typed_pyobj()));
+            state.grouper = Some(PyObjectRc::downgrade(&grouper.clone().into_typed_pyobj()));
             Ok((state.current_key.as_ref().unwrap().clone(), grouper))
         }