MAINT: respond to code review

numpy · charris · Feb 11, 2025 · Feb 6, 2025 · Feb 6, 2025 · Feb 6, 2025
commit 96ca7e3b248878b16ad197da395099033d06ddf8
diff --git a/numpy/_core/src/multiarray/convert_datatype.c b/numpy/_core/src/multiarray/convert_datatype.c
@@ -150,17 +150,15 @@ ensure_castingimpl_exists(PyArray_DTypeMeta *from, PyArray_DTypeMeta *to)
                          &res) < 0) {
        return_error = 1;
    }
-
-    if (res == NULL && !return_error) {
+    else if (res == NULL) {
        res = create_casting_impl(from, to);
        if (res == NULL) {
            return_error = 1;
        }
-    }
-    if (!return_error &&
-        PyDict_SetItem(NPY_DT_SLOTS(from)->castingimpls,
-                       (PyObject *)to, res) < 0) {
-        return_error = 1;
+        else if (PyDict_SetItem(NPY_DT_SLOTS(from)->castingimpls,
+                                (PyObject *)to, res) < 0) {
+            return_error = 1;
+        }
    }
    Py_END_CRITICAL_SECTION();
    if (return_error) {

diff --git a/numpy/testing/_private/utils.py b/numpy/testing/_private/utils.py
@@ -2704,13 +2704,11 @@ def run_threaded(func, max_workers=8, pass_count=False,
            else:
                all_args = [(func, *args) for i in range(max_workers)]
            try:
-                n_submitted = 0
                futures = []
                for arg in all_args:
                    futures.append(tpe.submit(*arg))
-                    n_submitted += 1
            finally:
-                if n_submitted < max_workers and pass_barrier:
+                if len(futures) < max_workers and pass_barrier:
                    barrier.abort()
            for f in futures:
                f.result()