RustPython
diff --git a/‎vm/src/frame.rs‎
Lines changed: 2 additions & 2 deletions b/‎vm/src/frame.rs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎vm/src/pyobject.rs‎
Lines changed: 30 additions & 24 deletions b/‎vm/src/pyobject.rs‎
Lines changed: 30 additions & 24 deletions
@@ -331,7 +331,7 @@ impl ExecutingFrame<'_> {
             let instr = &self.code.instructions[idx];
             let result = self.execute_instruction(instr, vm);
             match result {
-                Ok(None) => {}
+                Ok(None) => continue,
                 Ok(Some(value)) => {
                     break Ok(value);
                 }
@@ -349,7 +349,7 @@ impl ExecutingFrame<'_> {
                     exception.set_traceback(Some(new_traceback.into_ref(vm)));
 
                     match self.unwind_blocks(vm, UnwindReason::Raising { exception }) {
-                        Ok(None) => {}
+                        Ok(None) => continue,
                         Ok(Some(result)) => {
                             break Ok(result);
                         }
 
@@ -383,26 +383,41 @@ impl<T> TryFromObject for PyRef<T>
 where
     T: PyValue,
 {
+    #[inline]
     fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
         let class = T::class(vm);
         if obj.isinstance(class) {
-            obj.downcast().map_err(|obj| {
-                vm.new_runtime_error(format!(
-                    "Unexpected payload '{}' for type '{}'",
-                    class.name,
-                    obj.class().name,
-                ))
-            })
+            obj.downcast()
+                .map_err(|obj| pyref_payload_error(vm, class, obj))
         } else {
-            let expected_type = &class.name;
-            let actual_type = &obj.class().name;
-            Err(vm.new_type_error(format!(
-                "Expected type '{}', not '{}'",
-                expected_type, actual_type,
-            )))
+            Err(pyref_type_error(vm, class, obj))
         }
     }
 }
+// the impl Borrow allows to pass PyObjectRef or &PyObjectRef
+fn pyref_payload_error(
+    vm: &VirtualMachine,
+    class: &PyTypeRef,
+    obj: impl std::borrow::Borrow<PyObjectRef>,
+) -> PyBaseExceptionRef {
+    vm.new_runtime_error(format!(
+        "Unexpected payload '{}' for type '{}'",
+        &*class.name,
+        &*obj.borrow().class().name,
+    ))
+}
+fn pyref_type_error(
+    vm: &VirtualMachine,
+    class: &PyTypeRef,
+    obj: impl std::borrow::Borrow<PyObjectRef>,
+) -> PyBaseExceptionRef {
+    let expected_type = &*class.name;
+    let actual_type = &*obj.borrow().class().name;
+    vm.new_type_error(format!(
+        "Expected type '{}', not '{}'",
+        expected_type, actual_type,
+    ))
+}
 
 impl<'a, T: PyValue> From<&'a PyRef<T>> for &'a PyObjectRef {
     fn from(obj: &'a PyRef<T>) -> Self {
@@ -787,19 +802,10 @@ unsafe impl<T: PyValue> TransmuteFromObject for PyRef<T> {
             if obj.payload_is::<T>() {
                 Ok(())
             } else {
-                Err(vm.new_runtime_error(format!(
-                    "Unexpected payload '{}' for type '{}'",
-                    class.name,
-                    obj.class().name,
-                )))
+                Err(pyref_payload_error(vm, class, obj))
             }
         } else {
-            let expected_type = &class.name;
-            let actual_type = &obj.class().name;
-            Err(vm.new_type_error(format!(
-                "Expected type '{}', not '{}'",
-                expected_type, actual_type,
-            )))
+            Err(pyref_type_error(vm, class, obj))
         }
     }
 }