From fa7c9df67908a7c8e2b3787e6e9961b71e4136c3 Mon Sep 17 00:00:00 2001 From: Raynel Sanchez <87539502+raynelfss@users.noreply.github.com> Date: Mon, 10 Feb 2025 12:00:16 -0500 Subject: [PATCH] Fix: Use `&SmallVec<_>` instead of `&Box<_>` - Due to a `clippy` warning, switch to dereferencing the `Box` when returning references to parameters in an instruction. --- crates/accelerate/src/unitary_synthesis.rs | 2 +- crates/circuit/src/circuit_data.rs | 6 +++--- crates/circuit/src/converters.rs | 2 +- crates/circuit/src/dag_circuit.rs | 2 +- crates/circuit/src/packed_instruction.rs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/accelerate/src/unitary_synthesis.rs b/crates/accelerate/src/unitary_synthesis.rs index dfb987923358..cfd8382dc62c 100644 --- 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 index 41cde968d502..baaae2fb53c6 100644 --- 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 index f00f145b5d6f..c91531009a10 100644 --- 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 index ef8e33d423fc..edc22cc12658 100644 --- 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 index b72a3f54da5c..7493a3971030 100644 --- 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>> { - 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.