Remove duplicated code

fangerer · fangerer · commit b7fb295d7ffa · 2023-05-10T17:29:09.000+02:00
diff --git a/numpy/core/src/multiarray/common.h b/numpy/core/src/multiarray/common.h
@@ -492,26 +492,6 @@ HPyArray_TupleFromItems(HPyContext *ctx, int n, HPy const *items, int make_null_
     return HPyTupleBuilder_Build(ctx, builder);
 }
 
-static NPY_INLINE HPy
-HPyArray_TupleFromFieldItems(HPyContext *ctx, int n, HPy h_method, HPyField const *items, int make_null_none)
-{
-    HPyTupleBuilder builder = HPyTupleBuilder_New(ctx, n);
-    if (HPyTupleBuilder_IsNull(builder)) {
-        return HPy_NULL;
-    }
-    for (int i = 0; i < n; i ++) {
-        HPy tmp;
-        if (!make_null_none || !HPyField_IsNull(items[i])) {
-            tmp = HPyField_Load(ctx, h_method, items[i]);
-        }
-        else {
-            tmp = ctx->h_None;
-        }
-        HPyTupleBuilder_Set(ctx, builder, i, tmp);
-    }
-    return HPyTupleBuilder_Build(ctx, builder);
-}
-
 /*
  * HPy version of PyArray_TupleFromItems
  */
diff --git a/numpy/core/src/multiarray/experimental_public_dtype_api.c b/numpy/core/src/multiarray/experimental_public_dtype_api.c
@@ -347,7 +347,7 @@ PyUFunc_AddLoopFromSpec(PyObject *ufunc, PyArrayMethod_Spec *spec)
     HPy h_method = HPyField_Load(ctx, h_bmeth, bmeth->method);
     PyArrayMethodObject *method = PyArrayMethodObject_AsStruct(ctx, h_method);
     int nargs = method->nin + method->nout;
-    HPy h_dtypes = HPyArray_TupleFromFieldItems(ctx,
+    HPy h_dtypes = HPyArray_TupleFromFields(ctx,
             nargs, h_bmeth, bmeth->dtypes, 1);
     if (HPy_IsNull(h_dtypes)) {
         return -1;
