Move conversion impl to c-api

bschoenmaeckers · bschoenmaeckers · commit 95305759ebd7 · 2026-05-20T15:38:30.000+02:00
diff --git a/crates/capi/src/abstract_.rs b/crates/capi/src/abstract_.rs
@@ -2,11 +2,29 @@ use crate::{PyObject, pystate::with_vm};
 use alloc::slice;
 use core::ffi::c_int;
 use rustpython_vm::builtins::{PyDict, PyStr, PyTuple};
-use rustpython_vm::function::{FuncArgs, KwArgs};
-use rustpython_vm::{AsObject, PyObjectRef};
+use rustpython_vm::function::{FuncArgs, KwArgs, PosArgs};
+use rustpython_vm::{AsObject, Py, PyObjectRef, PyResult, VirtualMachine};
 
 const PY_VECTORCALL_ARGUMENTS_OFFSET: usize = 1usize << (usize::BITS as usize - 1);
 
+fn tuple_to_args(tuple: &Py<PyTuple>) -> PosArgs {
+    tuple.iter().cloned().collect::<Vec<_>>().into()
+}
+
+fn dict_to_kwargs(vm: &VirtualMachine, dict: &Py<PyDict>) -> PyResult<KwArgs> {
+    dict.items_vec()
+        .into_iter()
+        .map(|(key, value)| {
+            let key = key
+                .downcast_ref::<PyStr>()
+                .map(|s| s.to_string())
+                .ok_or_else(|| vm.new_type_error("keywords must be strings"))?;
+            Ok((key, value))
+        })
+        .collect::<PyResult<_>>()
+        .map(KwArgs::new)
+}
+
 #[unsafe(no_mangle)]
 pub unsafe extern "C" fn PyObject_Call(
     callable: *mut PyObject,
@@ -15,10 +33,10 @@ pub unsafe extern "C" fn PyObject_Call(
 ) -> *mut PyObject {
     with_vm(|vm| {
         let callable = unsafe { &*callable };
-        let args = unsafe { &*args }.try_downcast_ref::<PyTuple>(vm)?;
+        let args = tuple_to_args(unsafe { &*args }.try_downcast_ref::<PyTuple>(vm)?);
 
         let kwargs: Option<KwArgs> = unsafe { kwargs.as_ref() }
-            .map(|kwargs| kwargs.try_downcast_ref::<PyDict>(vm)?.try_into())
+            .map(|kwargs| dict_to_kwargs(vm, kwargs.try_downcast_ref::<PyDict>(vm)?))
             .transpose()?;
 
         callable.call_with_args(FuncArgs::new(args, kwargs.unwrap_or_default()), vm)
diff --git a/crates/vm/src/function/argument.rs b/crates/vm/src/function/argument.rs
@@ -1,6 +1,6 @@
 use crate::{
-    AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine,
-    builtins::{PyBaseExceptionRef, PyDict, PyStr, PyTuple, PyTupleRef, PyTypeRef},
+    AsObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine,
+    builtins::{PyBaseExceptionRef, PyTupleRef, PyTypeRef},
     convert::ToPyObject,
     object::{Traverse, TraverseFn},
 };
@@ -438,29 +438,6 @@ impl<T> FromIterator<(String, T)> for KwArgs<T> {
     }
 }
 
-impl TryFrom<&Py<PyDict>> for KwArgs<PyObjectRef> {
-    type Error = PyBaseExceptionRef;
-
-    fn try_from(kwargs: &Py<PyDict>) -> Result<Self, Self::Error> {
-        kwargs
-            .items_vec()
-            .into_iter()
-            .map(|(key, value)| {
-                let key = key
-                    .downcast_ref::<PyStr>()
-                    .map(|s| s.to_string())
-                    .ok_or_else(|| {
-                        crate::vm::thread::with_current_vm(|vm| {
-                            vm.new_type_error("keywords must be strings")
-                        })
-                    })?;
-                Ok((key, value))
-            })
-            .collect::<Result<IndexMap<_, _>, _>>()
-            .map(Self)
-    }
-}
-
 impl<T> Default for KwArgs<T> {
     fn default() -> Self {
         Self(IndexMap::new())
@@ -531,12 +508,6 @@ impl<T> From<Vec<T>> for PosArgs<T> {
     }
 }
 
-impl From<&Py<PyTuple>> for PosArgs<PyObjectRef> {
-    fn from(args: &Py<PyTuple>) -> Self {
-        Self(args.iter().cloned().collect())
-    }
-}
-
 impl From<()> for PosArgs<PyObjectRef> {
     fn from(_args: ()) -> Self {
         Self(Vec::new())
