first_in_mro -> mro_find_map

Author: youknowone

vm/src/obj/objobject.rs

@@ -66,8 +66,8 @@ impl PyBaseObject {
             }
             PyComparisonOp::Ne => {
                 let cmp = zelf
-                    .class()
-                    .first_in_mro(|cls| cls.slots.cmp.load())
+                    .lease_class()
+                    .mro_find_map(|cls| cls.slots.cmp.load())
                     .unwrap();
                 let value = match cmp(zelf, other, PyComparisonOp::Eq, vm)? {
                     Either::A(obj) => PyArithmaticValue::from_object(vm, obj)

vm/src/obj/objtype.rs

@@ -78,7 +78,7 @@ impl PyType {
         std::iter::once(self).chain(self.mro.iter().map(|cls| cls.deref()))
     }
 
-    pub(crate) fn first_in_mro<F, R>(&self, f: F) -> Option<R>
+    pub(crate) fn mro_find_map<F, R>(&self, f: F) -> Option<R>
     where
         F: Fn(&Self) -> Option<R>,
     {
@@ -515,7 +515,7 @@ impl SlotGetattro for PyType {
             let attr_class = attr.lease_class();
             if attr_class.has_attr("__set__") {
                 if let Some(ref descr_get) =
-                    PyLease::into_pyref(attr_class).first_in_mro(|cls| cls.slots.descr_get.load())
+                    attr_class.mro_find_map(|cls| cls.slots.descr_get.load())
                 {
                     let mcl = PyLease::into_pyref(mcl).into_object();
                     return descr_get(attr.clone(), Some(zelf.into_object()), Some(mcl), vm);
@@ -526,8 +526,10 @@ impl SlotGetattro for PyType {
         let zelf_attr = zelf.get_attr(name);
 
         if let Some(ref attr) = zelf_attr {
-            let attr_class = attr.class();
-            if let Some(descr_get) = attr_class.first_in_mro(|cls| cls.slots.descr_get.load()) {
+            if let Some(descr_get) = attr
+                .lease_class()
+                .mro_find_map(|cls| cls.slots.descr_get.load())
+            {
                 drop(mcl);
                 return descr_get(attr.clone(), None, Some(zelf.into_object()), vm);
             }

vm/src/pyobjectrc.rs

@@ -146,7 +146,7 @@ where
 
         // CPython-compatible drop implementation
         let zelf = Self::into_ref(self.clone());
-        if let Some(del_slot) = zelf.class().first_in_mro(|cls| cls.slots.del.load()) {
+        if let Some(del_slot) = zelf.lease_class().mro_find_map(|cls| cls.slots.del.load()) {
             crate::vm::thread::with_vm(&zelf, |vm| {
                 if let Err(e) = del_slot(&zelf, vm) {
                     // exception in del will be ignored but printed

vm/src/vm.rs

@@ -880,10 +880,10 @@ impl VirtualMachine {
         obj: Option<PyObjectRef>,
         cls: Option<PyObjectRef>,
     ) -> Option<PyResult> {
-        descr
-            .class()
-            .first_in_mro(|cls| cls.slots.descr_get.load())
-            .map(|descr_get| descr_get(descr, obj, cls, self))
+        let descr_get = descr
+            .lease_class()
+            .mro_find_map(|cls| cls.slots.descr_get.load());
+        descr_get.map(|descr_get| descr_get(descr, obj, cls, self))
     }
 
     pub fn call_get_descriptor(&self, descr: PyObjectRef, obj: PyObjectRef) -> Option<PyResult> {
@@ -915,7 +915,9 @@ impl VirtualMachine {
 
     fn _invoke(&self, callable: &PyObjectRef, args: PyFuncArgs) -> PyResult {
         vm_trace!("Invoke: {:?} {:?}", callable, args);
-        let slot_call = callable.class().first_in_mro(|cls| cls.slots.call.load());
+        let slot_call = callable
+            .lease_class()
+            .mro_find_map(|cls| cls.slots.call.load());
         match slot_call {
             Some(slot_call) => {
                 self.trace_event(TraceEvent::Call)?;
@@ -1009,8 +1011,8 @@ impl VirtualMachine {
         let attr_name = attr_name.try_into_ref(self)?;
         vm_trace!("vm.__getattribute__: {:?} {:?}", obj, attr_name);
         let getattro = obj
-            .class()
-            .first_in_mro(|cls| cls.slots.getattro.load())
+            .lease_class()
+            .mro_find_map(|cls| cls.slots.getattro.load())
             .unwrap();
         getattro(obj, attr_name, self)
     }
@@ -1153,8 +1155,8 @@ impl VirtualMachine {
     }
 
     pub fn is_callable(&self, obj: &PyObjectRef) -> bool {
-        obj.class()
-            .first_in_mro(|cls| cls.slots.call.load())
+        obj.lease_class()
+            .mro_find_map(|cls| cls.slots.call.load())
             .is_some()
     }
 
@@ -1437,8 +1439,8 @@ impl VirtualMachine {
 
         let call_cmp = |obj: &PyObjectRef, other, op| {
             let cmp = obj
-                .class()
-                .first_in_mro(|cls| cls.slots.cmp.load())
+                .lease_class()
+                .mro_find_map(|cls| cls.slots.cmp.load())
                 .unwrap();
             Ok(match cmp(obj, other, op, self)? {
                 Either::A(obj) => PyArithmaticValue::from_object(self, obj).map(Either::A),
@@ -1489,8 +1491,8 @@ impl VirtualMachine {
 
     pub fn _hash(&self, obj: &PyObjectRef) -> PyResult<rustpython_common::hash::PyHash> {
         let hash = obj
-            .class()
-            .first_in_mro(|cls| cls.slots.hash.load())
+            .lease_class()
+            .mro_find_map(|cls| cls.slots.hash.load())
             .unwrap(); // hash always exist
         hash(&obj, self)
     }