chore: update to hugr 0.14.4 (#785)

and simplify strum dependency
CQCL · Feb 25, 2025 · a88aaef · a88aaef
1 parent 2cff11b
commit a88aaef
Show file tree

Hide file tree

Showing 14 changed files with 149 additions and 184 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,23 +26,23 @@ missing_docs = "warn"
 [patch.crates-io]
 
 # Uncomment to use unreleased versions of hugr
-# hugr = { git = "https://github.com/CQCL/hugr", rev = "09bd748398ce5afb39f5628d838756ccc03fc775" }
-# hugr-core = { git = "https://github.com/CQCL/hugr", rev = "09bd748398ce5afb39f5628d838756ccc03fc775" }
-# hugr-passes = { git = "https://github.com/CQCL/hugr", rev = "09bd748398ce5afb39f5628d838756ccc03fc775" }
-# hugr-cli = { git = "https://github.com/CQCL/hugr", rev = "09bd748398ce5afb39f5628d838756ccc03fc775" }
-# hugr-model = { git = "https://github.com/CQCL/hugr", rev = "09bd748398ce5afb39f5628d838756ccc03fc775" }
+# hugr = { git = "https://github.com/CQCL/hugr", rev = "c642855" }
+# hugr-core = { git = "https://github.com/CQCL/hugr", rev = "c642855" }
+# hugr-passes = { git = "https://github.com/CQCL/hugr", rev = "c642855" }
+# hugr-cli = { git = "https://github.com/CQCL/hugr", rev = "c642855" }
+# hugr-model = { git = "https://github.com/CQCL/hugr", rev = "c642855" }
 # portgraph = { git = "https://github.com/CQCL/portgraph", rev = "68b96ac737e0c285d8c543b2d74a7aa80a18202c" }
 
 [workspace.dependencies]
 
 # Make sure to run `just recompile-eccs` if the hugr serialisation format changes.
-hugr = "0.14.3"
-hugr-core = "0.14.3"
-hugr-cli = "0.14.3"
+hugr = "0.14.4"
+hugr-core = "0.14.4"
+hugr-cli = "0.14.4"
 portgraph = "0.13.1"
 pyo3 = "0.23.4"
 itertools = "0.14.0"
-tket-json-rs = "0.7.1"
+tket-json-rs = "0.7.2"
 tracing = "0.1.37"
 portmatching = "0.3.1"
 bytemuck = "1.21.0"
@@ -53,12 +53,9 @@ crossbeam-channel = "0.5.14"
 csv = "1.3.1"
 delegate = "0.13.2"
 derive_more = "1.0.0"
-downcast-rs = "2.0.1"
 fxhash = "0.2.1"
 indexmap = "2.7.1"
 lazy_static = "1.5.0"
-num-complex = "0.4"
-num-rational = "0.4"
 num_cpus = "1.16.0"
 peak_alloc = "0.2.0"
 pest = "2.7.15"
@@ -71,8 +68,7 @@ rstest = "0.23.0"
 serde = "1.0"
 serde_json = "1.0"
 smol_str = "0.3.2"
-strum = "0.26.3"
-strum_macros = "0.26.4"
+strum = "0.27"
 tracing-appender = "0.2.2"
 tracing-subscriber = "0.3.19"
 typetag = "0.2.19"

diff --git a/badger-optimiser/Cargo.toml b/badger-optimiser/Cargo.toml
@@ -11,15 +11,11 @@ publish = false
 
 [dependencies]
 clap = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
 tket2 = { path = "../tket2", features = [
     "portmatching",
     "rewrite-tracing",
     "binary-eccs",
 ] }
-hugr = { workspace = true }
-itertools = { workspace = true }
-tket-json-rs = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 tracing-appender = { workspace = true }

diff --git a/compile-rewriter/Cargo.toml b/compile-rewriter/Cargo.toml
@@ -10,5 +10,3 @@ publish = false
 [dependencies]
 clap = { workspace = true, features = ["derive"] }
 tket2 = { path = "../tket2", features = ["portmatching", "binary-eccs"] }
-hugr = { workspace = true }
-itertools = { workspace = true }
diff --git a/devenv.lock b/devenv.lock
@@ -3,10 +3,10 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1736426010,
+        "lastModified": 1740460834,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "1c384bc4be3ee571511fbbc6fdc94fe47d60f6cf",
+        "rev": "9e4003b2702483bd962dac3d4ff43e8dafb93cda",
         "type": "github"
       },
       "original": {
@@ -24,10 +24,10 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1736490741,
+        "lastModified": 1740378829,
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "ff8cb1e6d1755aa3ace7c662f79f74882cc5022f",
+        "rev": "92823f1b0c919d7e2d806956aaf98e90f3761ab7",
         "type": "github"
       },
       "original": {
@@ -73,15 +73,14 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736320768,
+        "lastModified": 1740481401,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
+        "rev": "588be683dfe0b76158642c88e4478031bfbbc783",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -110,10 +109,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1735882644,
+        "lastModified": 1737465171,
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
         "type": "github"
       },
       "original": {
@@ -134,10 +133,10 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1736424758,
+        "lastModified": 1740424553,
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "cc016df54b03d8c1bbb1aae761da01dbfae5f126",
+        "rev": "3bb49be89a4f31fed4d64da6e4cda3c5871a8d67",
         "type": "github"
       },
       "original": {

diff --git a/devenv.yaml b/devenv.yaml
@@ -1,6 +1,6 @@
 inputs:
   nixpkgs:
-    url: github:NixOS/nixpkgs/nixpkgs-unstable
+    url: github:NixOS/nixpkgs
   nixpkgs-2305:
     url: github:NixOS/nixpkgs/nixos-23.05
   fenix:

diff --git a/tket2-hseries/Cargo.toml b/tket2-hseries/Cargo.toml
@@ -26,10 +26,8 @@ hugr.workspace = true
 tket2 = { path = "../tket2", version = "0.7.2" }
 lazy_static.workspace = true
 serde = { workspace = true, features = ["derive"] }
-serde_json.workspace = true
 smol_str.workspace = true
-strum.workspace = true
-strum_macros.workspace = true
+strum = { workspace = true, features = ["derive"]}
 itertools.workspace = true
 clap = { workspace = true, optional = true }
 hugr-cli = { workspace = true, optional = true }

diff --git a/tket2-hseries/src/extension/futures.rs b/tket2-hseries/src/extension/futures.rs
@@ -21,7 +21,7 @@ use hugr::{
 use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
 use smol_str::SmolStr;
-use strum_macros::{EnumIter, EnumString, IntoStaticStr};
+use strum::{EnumIter, EnumString, IntoStaticStr};
 
 /// The ID of the `tket2.futures` extension.
 pub const EXTENSION_ID: ExtensionId = ExtensionId::new_unchecked("tket2.futures");

diff --git a/tket2-hseries/src/extension/qsystem.rs b/tket2-hseries/src/extension/qsystem.rs
@@ -25,7 +25,7 @@ use hugr::{
 
 use derive_more::Display;
 use lazy_static::lazy_static;
-use strum_macros::{EnumIter, EnumString, IntoStaticStr};
+use strum::{EnumIter, EnumString, IntoStaticStr};
 
 use crate::extension::futures;
 

diff --git a/tket2-hseries/src/extension/result.rs b/tket2-hseries/src/extension/result.rs
@@ -24,7 +24,7 @@ use hugr::{
 
 use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
-use strum_macros::{EnumIter, EnumString, IntoStaticStr};
+use strum::{EnumIter, EnumString, IntoStaticStr};
 
 /// The "tket2.result" extension id.
 pub const EXTENSION_ID: ExtensionId = ExtensionId::new_unchecked("tket2.result");

diff --git a/tket2-py/Cargo.toml b/tket2-py/Cargo.toml
@@ -27,7 +27,6 @@ serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tket-json-rs = { workspace = true, features = ["pyo3"] }
 hugr = { workspace = true }
-portgraph = { workspace = true, features = ["serde"] }
 pyo3 = { workspace = true, features = ["py-clone", "abi3-py310"] }
 num_cpus = { workspace = true }
 derive_more = { workspace = true, features = ["into", "from"] }

diff --git a/tket2/Cargo.toml b/tket2/Cargo.toml
@@ -36,13 +36,10 @@ default = ["binary-eccs"]
 [dependencies]
 lazy_static = { workspace = true }
 cgmath = { workspace = true }
-num-rational = { workspace = true }
-num-complex = { workspace = true, optional = true }
 tket-json-rs = { workspace = true }
 rayon = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-downcast-rs = { workspace = true }
 priority-queue = { workspace = true }
 smol_str = { workspace = true }
 typetag = { workspace = true }
@@ -58,8 +55,7 @@ derive_more = { workspace = true, features = [
 hugr = { workspace = true }
 hugr-core = { workspace = true }
 portgraph = { workspace = true, features = ["serde"] }
-strum_macros = { workspace = true }
-strum = { workspace = true }
+strum = { workspace = true, features = ["derive"]}
 fxhash = { workspace = true }
 indexmap = { workspace = true }
 rmp-serde = { workspace = true, optional = true }

diff --git a/tket2/src/ops.rs b/tket2/src/ops.rs
@@ -19,7 +19,7 @@ use hugr::{
 
 use derive_more::{Display, Error};
 use serde::{Deserialize, Serialize};
-use strum_macros::{EnumIter, EnumString, IntoStaticStr};
+use strum::{EnumIter, EnumString, IntoStaticStr};
 
 #[derive(
     Clone,

diff --git a/uv.lock b/uv.lock