Fix: Use &SmallVec<_> instead of &Box<_>

- Due to a `clippy` warning, switch to dereferencing the `Box` when returning references to parameters in an instruction.
raynelfss · Feb 10, 2025 · fa7c9df · fa7c9df
1 parent c818a4f
commit fa7c9df
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/crates/accelerate/src/unitary_synthesis.rs b/crates/accelerate/src/unitary_synthesis.rs
@@ -563,7 +563,7 @@ fn run_2q_unitary_synthesis(
                             .collect();
                         (
                             inst.op().name().to_string(),
-                            inst.params_raw().cloned().map(|boxed| *boxed),
+                            inst.params_raw().cloned(),
                             inst_qubits,
                         )
                     });

diff --git a/crates/circuit/src/circuit_data.rs b/crates/circuit/src/circuit_data.rs
@@ -300,7 +300,7 @@ impl CircuitData {
                     inst.op().py_deepcopy(py, Some(&memo))?,
                     inst.qubits(),
                     inst.clbits(),
-                    inst.params_raw().cloned(),
+                    inst.params_raw().cloned().map(|params| params.into()),
                     inst.extra_attrs().clone(),
                 ));
             }
@@ -310,7 +310,7 @@ impl CircuitData {
                     inst.op().py_copy(py)?,
                     inst.qubits(),
                     inst.clbits(),
-                    inst.params_raw().cloned(),
+                    inst.params_raw().cloned().map(|params| params.into()),
                     inst.extra_attrs().clone(),
                 ));
             }
@@ -690,7 +690,7 @@ impl CircuitData {
                     inst.op().clone(),
                     qubits_id,
                     clbits_id,
-                    inst.params_raw().cloned(),
+                    inst.params_raw().cloned().map(|params| params.into()),
                     inst.extra_attrs().clone(),
                 ));
                 self.track_instruction_parameters(py, new_index)?;

diff --git a/crates/circuit/src/converters.rs b/crates/circuit/src/converters.rs
@@ -114,7 +114,7 @@ pub fn dag_to_circuit(
                     op,
                     instr.qubits(),
                     instr.clbits(),
-                    instr.params_raw().cloned(),
+                    instr.params_raw().cloned().map(|params| params.into()),
                     instr.extra_attrs().clone(),
                 ))
             } else {

diff --git a/crates/circuit/src/dag_circuit.rs b/crates/circuit/src/dag_circuit.rs
@@ -6775,7 +6775,7 @@ impl DAGCircuit {
                     },
                     qarg_map[instr.qubits()],
                     carg_map[instr.clbits()],
-                    instr.params_raw().cloned(),
+                    instr.params_raw().cloned().map(|params| params.into()),
                     instr.extra_attrs().clone(),
                 ))
             }),

diff --git a/crates/circuit/src/packed_instruction.rs b/crates/circuit/src/packed_instruction.rs
@@ -815,8 +815,8 @@ impl PackedInstruction {
 
     /// Get a reference of the contained parameters.
     #[inline]
-    pub fn params_raw(&self) -> Option<&Box<SmallVec<[Param; 3]>>> {
-        self.params.as_ref()
+    pub fn params_raw(&self) -> Option<&SmallVec<[Param; 3]>> {
+        self.params.as_deref()
     }
 
     /// Get a mutable reference of the contained parameters.