Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 43 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ hugr-cli = "0.22.2"
portgraph = "0.15.2"
pyo3 = ">= 0.23.4, < 0.26"
itertools = "0.14.0"
tket-json-rs = "0.7.4"
tket-json-rs = "0.7.5"
tracing = "0.1.37"
portmatching = "0.3.3"
bytemuck = "1.23.2"
Expand Down
2 changes: 1 addition & 1 deletion tket-py/test/test_circuit.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def test_conversion_qsystem():
assert tk1_dot == tk2_dot

# Check that we didn't use the opaque tk1 op fallback.
# TODO: There's no way to traverse the circuit nodes??
# TODO: There's no way to traverse the circuit nodes?
assert "TKET1.tk1op" not in tk1_dot
assert "tket.qsystem.PhasedX" in tk1_dot
assert "tket.qsystem.ZZPhase" in tk1_dot
Expand Down
2 changes: 1 addition & 1 deletion tket-qsystem/src/pytket/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ fn compare_serial_circs(a: &SerialCircuit, b: &SerialCircuit) {
impl From<&tket_json_rs::circuit_json::Command> for CommandInfo {
fn from(command: &tket_json_rs::circuit_json::Command) -> Self {
let mut info = CommandInfo {
op_type: command.op.op_type.clone(),
op_type: command.op.op_type,
params: command.op.params.clone().unwrap_or_default(),
n_args: command.args.len(),
};
Expand Down
2 changes: 1 addition & 1 deletion tket/src/serialize/pytket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ impl PytketDecodeError {

/// Add the pytket operation name to the error.
pub fn pytket_op(mut self, op: &tket_json_rs::OpType) -> Self {
self.pytket_op = Some(format!("{op:?}"));
self.pytket_op = Some(format!("{op}"));
self
}

Expand Down
2 changes: 1 addition & 1 deletion tket/src/serialize/pytket/decoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ impl<'h> PytketDecoderContext<'h> {
) -> Result<(), PytketDecodeError> {
let config = self.config.clone();
for com in commands {
let op_type = com.op.op_type.clone();
let op_type = com.op.op_type;
self.process_command(com, config.as_ref())
.map_err(|e| e.pytket_op(&op_type))?;
}
Expand Down
2 changes: 1 addition & 1 deletion tket/src/serialize/pytket/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ fn compare_serial_circs(a: &SerialCircuit, b: &SerialCircuit) {
impl From<&tket_json_rs::circuit_json::Command> for CommandInfo {
fn from(command: &tket_json_rs::circuit_json::Command) -> Self {
CommandInfo {
op_type: command.op.op_type.clone(),
op_type: command.op.op_type,
params: command.op.params.clone().unwrap_or_default(),
n_args: command.args.len(),
}
Expand Down
Loading