Simplify initialization of array of elements that are not Copy (#28)

* Simplify initialization of array of elements that are not Copy * Only generate array when necessary
mtreinish · Jun 6, 2024 · c9ac618 · c9ac618
1 parent faac655
commit c9ac618
Showing 1 changed file with 3 additions and 19 deletions.
diff --git a/crates/circuit/src/imports.rs b/crates/circuit/src/imports.rs
@@ -136,13 +136,7 @@ pub fn populate_std_gate_map(py: Python, rs_gate: StandardGate, py_gate: PyObjec
         match STDGATE_PYTHON_GATES.get_mut() {
             Some(gate_map) => gate_map,
             None => {
-                // A fixed size array is initialized like this because using the `[T; 5]` syntax
-                // requires T to be `Copy`. But `PyObject` isn't Copy so therefore Option<PyObject>
-                // as T isn't Copy. To avoid that we just list out None STANDARD_GATE_SIZE times
-                let array: [Option<PyObject>; STANDARD_GATE_SIZE] = [
-                    None, None, None, None, None, None, None, None, None, None, None, None, None,
-                    None, None, None, None, None,
-                ];
+                let array: [Option<PyObject>; STANDARD_GATE_SIZE] = core::array::from_fn(|_| None);
                 STDGATE_PYTHON_GATES.set(py, array).unwrap();
                 STDGATE_PYTHON_GATES.get_mut().unwrap()
             }
@@ -156,18 +150,8 @@ pub fn populate_std_gate_map(py: Python, rs_gate: StandardGate, py_gate: PyObjec
 
 #[inline]
 pub fn get_std_gate_class(py: Python, rs_gate: StandardGate) -> PyResult<PyObject> {
-    let gate_map = unsafe {
-        STDGATE_PYTHON_GATES.get_or_init(py, || {
-            // A fixed size array is initialized like this because using the `[T; 5]` syntax
-            // requires T to be `Copy`. But `PyObject` isn't Copy so therefore Option<PyObject>
-            // as T isn't Copy. To avoid that we just list out None STANDARD_GATE_SIZE times
-            let array: [Option<PyObject>; STANDARD_GATE_SIZE] = [
-                None, None, None, None, None, None, None, None, None, None, None, None, None, None,
-                None, None, None, None,
-            ];
-            array
-        })
-    };
+    let gate_map =
+        unsafe { STDGATE_PYTHON_GATES.get_or_init(py, || core::array::from_fn(|_| None)) };
     let gate = &gate_map[rs_gate as usize];
     let populate = gate.is_none();
     let out_gate = match gate {