Skip to content

Commit

Permalink
Fix merge conflict with Qiskit#12943
Browse files Browse the repository at this point in the history
With the recent merge with main we pulled in Qiskit#12943 which conflicted
with the rust space API changes made in this PR branch. This commit
updates the usage to conform with the new interface introduced in this
PR.
  • Loading branch information
mtreinish committed Aug 12, 2024
1 parent 0e62ad0 commit aaf38b9
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions crates/circuit/src/circuit_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,8 @@ impl CircuitData {
global_phase,
)?;
for (operation, params, qargs, cargs) in instruction_iter {
let qubits = (&mut res.qargs_interner)
.intern(InternerKey::Value(qargs))?
.index;
let clbits = (&mut res.cargs_interner)
.intern(InternerKey::Value(cargs))?
.index;
let qubits = (&mut res.qargs_interner).intern(qargs)?;
let clbits = (&mut res.cargs_interner).intern(cargs)?;
let params = (!params.is_empty()).then(|| Box::new(params));
res.data.push(PackedInstruction {
op: operation,
Expand Down

0 comments on commit aaf38b9

Please sign in to comment.