diff --git a/Cargo.lock b/Cargo.lock index 801025ab8..ab8bef89d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -296,9 +296,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.33" +version = "1.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee0f8803222ba5a7e2777dd72ca451868909b1ac410621b676adf07280e9b5f" +checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc" dependencies = [ "jobserver", "libc", @@ -752,7 +752,16 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ - "derive_more-impl", + "derive_more-impl 1.0.0", +] + +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl 2.0.1", ] [[package]] @@ -767,6 +776,18 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -1057,7 +1078,7 @@ dependencies = [ "derive_more 1.0.0", "hugr", "serde_json", - "thiserror 2.0.15", + "thiserror 2.0.16", "tracing", "tracing-subscriber", ] @@ -1094,7 +1115,7 @@ dependencies = [ "smol_str", "static_assertions", "strum", - "thiserror 2.0.15", + "thiserror 2.0.16", "tracing", "typetag", "zstd", @@ -1139,7 +1160,7 @@ dependencies = [ "pretty", "semver", "smol_str", - "thiserror 2.0.15", + "thiserror 2.0.16", ] [[package]] @@ -1157,7 +1178,7 @@ dependencies = [ "petgraph 0.8.2", "portgraph 0.15.2", "strum", - "thiserror 2.0.15", + "thiserror 2.0.16", ] [[package]] @@ -1538,7 +1559,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" dependencies = [ "memchr", - "thiserror 2.0.15", + "thiserror 2.0.16", "ucd-trie", ] @@ -1676,7 +1697,7 @@ dependencies = [ "petgraph 0.8.2", "serde", "smallvec", - "thiserror 2.0.15", + "thiserror 2.0.16", ] [[package]] @@ -2131,9 +2152,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.142" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" +checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" dependencies = [ "itoa", "memchr", @@ -2322,11 +2343,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d76d3f064b981389ecb4b6b7f45a0bf9fdac1d5b9204c7bd6714fecc302850" +checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" dependencies = [ - "thiserror-impl 2.0.15", + "thiserror-impl 2.0.16", ] [[package]] @@ -2342,9 +2363,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d29feb33e986b6ea906bd9c3559a856983f92371b3eaa5e83782a351623de0" +checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" dependencies = [ "proc-macro2", "quote", @@ -2463,11 +2484,11 @@ dependencies = [ [[package]] name = "tket-json-rs" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc84d7bd6b104cea080d51fb23ce5ec7c583fa1f676842c3c46a50ccd0e2000e" +checksum = "60e5f44e3eae03ba24c92b53c6ec79cb2dcf120bf7169510bc60d941accbc2f7" dependencies = [ - "derive_more 1.0.0", + "derive_more 2.0.1", "pyo3", "pythonize", "serde", @@ -2532,7 +2553,7 @@ dependencies = [ "rstest", "serde", "serde_json", - "thiserror 2.0.15", + "thiserror 2.0.16", "tket-json-rs", ] @@ -2708,9 +2729,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be" dependencies = [ "getrandom", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 252d7b953..ff4f9dc55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/tket-py/test/test_circuit.py b/tket-py/test/test_circuit.py index ea6b88506..3890d2082 100644 --- a/tket-py/test/test_circuit.py +++ b/tket-py/test/test_circuit.py @@ -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 diff --git a/tket-qsystem/src/pytket/tests.rs b/tket-qsystem/src/pytket/tests.rs index c4c598b49..f24b4df60 100644 --- a/tket-qsystem/src/pytket/tests.rs +++ b/tket-qsystem/src/pytket/tests.rs @@ -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(), }; diff --git a/tket/src/serialize/pytket.rs b/tket/src/serialize/pytket.rs index 739617139..56127504a 100644 --- a/tket/src/serialize/pytket.rs +++ b/tket/src/serialize/pytket.rs @@ -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 } diff --git a/tket/src/serialize/pytket/decoder.rs b/tket/src/serialize/pytket/decoder.rs index 7ae54de78..3dd28d06d 100644 --- a/tket/src/serialize/pytket/decoder.rs +++ b/tket/src/serialize/pytket/decoder.rs @@ -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))?; } diff --git a/tket/src/serialize/pytket/tests.rs b/tket/src/serialize/pytket/tests.rs index a80ba1b31..ff282e0ae 100644 --- a/tket/src/serialize/pytket/tests.rs +++ b/tket/src/serialize/pytket/tests.rs @@ -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(), }