use PyTuple_Pack in fixed-size tuple conversions

PyO3 · Jul 4, 2023 · 867a12b · 867a12b
1 parent 40437c5
commit 867a12b
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/src/types/tuple.rs b/src/types/tuple.rs
@@ -284,22 +284,24 @@ fn wrong_tuple_length(t: &PyTuple, expected_length: usize) -> PyErr {
 macro_rules! tuple_conversion ({$length:expr,$(($refN:ident, $n:tt, $T:ident)),+} => {
     impl <$($T: ToPyObject),+> ToPyObject for ($($T,)+) {
         fn to_object(&self, py: Python<'_>) -> PyObject {
-            unsafe {
-                let ptr = ffi::PyTuple_New($length);
-                let ret = PyObject::from_owned_ptr(py, ptr);
-                $(ffi::PyTuple_SetItem(ptr, $n, self.$n.to_object(py).into_ptr());)+
-                ret
+            #[inline]
+            fn inner(py: Python<'_>, $($refN: PyObject),+) -> PyObject {
+                unsafe {
+                    PyObject::from_owned_ptr(py, ffi::PyTuple_Pack($length, $($refN.as_ptr()),+))
+                }
             }
+            inner(py, $(self.$n.to_object(py)),+)
         }
     }
     impl <$($T: IntoPy<PyObject>),+> IntoPy<PyObject> for ($($T,)+) {
         fn into_py(self, py: Python<'_>) -> PyObject {
-            unsafe {
-                let ptr = ffi::PyTuple_New($length);
-                let ret =  PyObject::from_owned_ptr(py, ptr);
-                $(ffi::PyTuple_SetItem(ptr, $n, self.$n.into_py(py).into_ptr());)+
-               ret
+            #[inline]
+            fn inner(py: Python<'_>, $($refN: PyObject),+) -> PyObject {
+                unsafe {
+                    Py::from_owned_ptr(py, ffi::PyTuple_Pack($length, $($refN.as_ptr()),+))
+                }
             }
+            inner(py, $(self.$n.into_py(py)),+)
         }
 
         #[cfg(feature = "experimental-inspect")]
@@ -310,12 +312,13 @@ fn type_output() -> TypeInfo {
 
     impl <$($T: IntoPy<PyObject>),+> IntoPy<Py<PyTuple>> for ($($T,)+) {
         fn into_py(self, py: Python<'_>) -> Py<PyTuple> {
-            unsafe {
-                let ptr = ffi::PyTuple_New($length);
-                let ret = Py::from_owned_ptr(py, ptr);
-                $(ffi::PyTuple_SetItem(ptr, $n, self.$n.into_py(py).into_ptr());)+
-                ret
+            #[inline]
+            fn inner(py: Python<'_>, $($refN: PyObject),+) -> Py<PyTuple> {
+                unsafe {
+                    Py::from_owned_ptr(py, ffi::PyTuple_Pack($length, $($refN.as_ptr()),+))
+                }
             }
+            inner(py, $(self.$n.into_py(py)),+)
         }
 
         #[cfg(feature = "experimental-inspect")]