no more IdProtocol-depending api

youknowone · youknowone · commit 9be1dc1f8bfd · 2022-04-17T10:25:02.000+09:00
diff --git a/vm/src/builtins/bytearray.rs b/vm/src/builtins/bytearray.rs
@@ -719,7 +719,7 @@ impl Comparable for PyByteArray {
         op: PyComparisonOp,
         vm: &VirtualMachine,
     ) -> PyResult<PyComparisonValue> {
-        if let Some(res) = op.identical_optimization(&zelf, &other) {
+        if let Some(res) = op.identical_optimization(zelf, other) {
             return Ok(res.into());
         }
         Ok(zelf.inner().cmp(other, op, vm))
diff --git a/vm/src/pyobjectrc.rs b/vm/src/pyobjectrc.rs
@@ -772,7 +772,7 @@ impl AsRef<PyObject> for PyObject {
 
 impl IdProtocol for PyObjectRef {
     fn get_id(&self) -> usize {
-        self.ptr.as_ptr() as usize
+        PyObject::get_id(self)
     }
 }
 
diff --git a/vm/src/types/slot.rs b/vm/src/types/slot.rs
@@ -11,7 +11,10 @@ use crate::{
 };
 use crossbeam_utils::atomic::AtomicCell;
 use num_traits::{Signed, ToPrimitive};
-use std::{borrow::Cow, cmp::Ordering};
+use std::{
+    borrow::{Borrow, Cow},
+    cmp::Ordering,
+};
 
 // The corresponding field in CPython is `tp_` prefixed.
 // e.g. name -> tp_name
@@ -517,11 +520,8 @@ pub trait GetDescriptor: PyValue {
     }
 
     #[inline]
-    fn _cls_is<T>(cls: &Option<PyObjectRef>, other: &T) -> bool
-    where
-        T: IdProtocol,
-    {
-        cls.as_ref().map_or(false, |cls| other.is(cls))
+    fn _cls_is(cls: &Option<PyObjectRef>, other: &impl Borrow<PyObject>) -> bool {
+        cls.as_ref().map_or(false, |cls| other.borrow().is(cls))
     }
 }
 
@@ -711,8 +711,12 @@ impl PyComparisonOp {
     /// Returns an appropriate return value for the comparison when a and b are the same object, if an
     /// appropriate return value exists.
     #[inline]
-    pub fn identical_optimization(self, a: &impl IdProtocol, b: &impl IdProtocol) -> Option<bool> {
-        self.map_eq(|| a.is(b))
+    pub fn identical_optimization(
+        self,
+        a: &impl Borrow<PyObject>,
+        b: &impl Borrow<PyObject>,
+    ) -> Option<bool> {
+        self.map_eq(|| a.borrow().is(b.borrow()))
     }
 
     /// Returns `Some(true)` when self is `Eq` and `f()` returns true. Returns `Some(false)` when self

Original file line number	Diff line number	Diff line change
`@@ -719,7 +719,7 @@ impl Comparable for PyByteArray {`
`719`	`719`	`op: PyComparisonOp,`
`720`	`720`	`vm: &VirtualMachine,`
`721`	`721`	`) -> PyResult<PyComparisonValue> {`
`722`		`- if let Some(res) = op.identical_optimization(&zelf, &other) {`
	`722`	`+ if let Some(res) = op.identical_optimization(zelf, other) {`
`723`	`723`	`return Ok(res.into());`
`724`	`724`	`}`
`725`	`725`	`Ok(zelf.inner().cmp(other, op, vm))`
Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ impl AsRef<PyObject> for PyObject {`
`772`	`772`
`773`	`773`	`impl IdProtocol for PyObjectRef {`
`774`	`774`	`fn get_id(&self) -> usize {`
`775`		`- self.ptr.as_ptr() as usize`
	`775`	`+ PyObject::get_id(self)`
`776`	`776`	`}`
`777`	`777`	`}`
`778`	`778`