feat!: Update to hugr 0.21 (#965)

BREAKING CHANGE: Public `hugr` dependency updated to `0.21.0`.

---------

Co-authored-by: Luca Mondada <luca@mondada.net>
Co-authored-by: Lukas Heidemann <lukas@heidemann.me>
Co-authored-by: Seyon Sivarajah <seyon.sivarajah@quantinuum.com>

Author: 4 people

Cargo.lock

@@ -38,19 +38,18 @@ large_enum_variant = "allow"
 [patch.crates-io]
 
 # Uncomment to use unreleased versions of hugr
-# hugr = { git = "https://github.com/CQCL/hugr", branch = "ss/push-xvxtzqlwkvux" }
-# hugr-core = { git = "https://github.com/CQCL/hugr", branch = "ss/push-xvxtzqlwkvux" }
-# hugr-passes = { git = "https://github.com/CQCL/hugr", branch = "ss/push-xvxtzqlwkvux" }
-# hugr-cli = { git = "https://github.com/CQCL/hugr", branch = "ss/push-xvxtzqlwkvux" }
-
-
+#hugr = { git = "https://github.com/CQCL/hugr", "rev" = "34eed3422c9aa34bd6b8ad868dcbab733eb5d14c" }
+#hugr-core = { git = "https://github.com/CQCL/hugr", "rev" = "34eed3422c9aa34bd6b8ad868dcbab733eb5d14c" }
+#hugr-passes = { git = "https://github.com/CQCL/hugr", "rev" = "34eed3422c9aa34bd6b8ad868dcbab733eb5d14c" }
+#hugr-cli = { git = "https://github.com/CQCL/hugr", "rev" = "34eed3422c9aa34bd6b8ad868dcbab733eb5d14c" }
 # 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.20.2"
-hugr-core = "0.20.2"
-hugr-cli = "0.20.2"
+hugr = "0.21.0"
+hugr-core = "0.21.0"
+hugr-cli = "0.21.0"
 portgraph = "0.14.1"
 pyo3 = ">= 0.23.4, < 0.26"
 itertools = "0.14.0"

Cargo.toml

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0",
+  "version": "0.2.0",
   "name": "tket2.wasm",
   "types": {
     "context": {
@@ -85,7 +85,7 @@
               "id": "func",
               "args": [
                 {
-                  "tya": "Sequence",
+                  "tya": "List",
                   "elems": [
                     {
                       "tya": "Variable",
@@ -101,7 +101,7 @@
                   ]
                 },
                 {
-                  "tya": "Sequence",
+                  "tya": "List",
                   "elems": [
                     {
                       "tya": "Variable",
@@ -258,7 +258,7 @@
               "id": "func",
               "args": [
                 {
-                  "tya": "Sequence",
+                  "tya": "List",
                   "elems": [
                     {
                       "tya": "Variable",
@@ -274,7 +274,7 @@
                   ]
                 },
                 {
-                  "tya": "Sequence",
+                  "tya": "List",
                   "elems": [
                     {
                       "tya": "Variable",

tket2-exts/src/tket2_exts/data/tket2/wasm.json

@@ -15,7 +15,7 @@ categories = ["compilers"]
 
 [features]
 default = ["cli"]
-cli = ["dep:clap", "dep:hugr-cli"]
+cli = ["dep:clap", "dep:hugr-cli", "dep:anyhow"]
 llvm = ["tket2/llvm", "dep:anyhow"]
 
 [[bin]]

tket2-hseries/Cargo.toml

@@ -1,10 +1,11 @@
 //! CLI for tket2-hseries
 
+use anyhow::Result;
 use clap::Parser as _;
 use hugr::extension::ExtensionRegistry;
 use tket2_hseries::cli::CliArgs;
 
-fn main() {
+fn main() -> Result<()> {
     match CliArgs::parse() {
         CliArgs::GenExtensions(args) => {
             let reg = ExtensionRegistry::new([
@@ -20,11 +21,13 @@ fn main() {
                 tket2_hseries::extension::wasm::EXTENSION.to_owned(),
             ]);
 
-            args.run_dump(&reg);
+            args.run_dump(&reg)?;
         }
         _ => {
             eprintln!("Unknown command");
             std::process::exit(1);
         }
     };
+
+    Ok(())
 }

tket2-hseries/src/bin/tket2-hseries.rs

@@ -48,9 +48,9 @@ fn add_future_type_def(
 ) -> Result<&TypeDef, ExtensionBuildError> {
     ext.add_type(
         FUTURE_TYPE_NAME.to_owned(),
-        vec![TypeBound::Any.into()],
+        vec![TypeBound::Linear.into()],
         "A value that is computed asynchronously".into(),
-        TypeBound::Any.into(),
+        TypeBound::Linear.into(),
         &extension_ref,
     )
 }
@@ -61,7 +61,7 @@ pub fn future_custom_type(t: Type, extension_ref: &Weak<Extension>) -> CustomTyp
         FUTURE_TYPE_NAME.to_owned(),
         vec![t.into()],
         EXTENSION_ID,
-        TypeBound::Any,
+        TypeBound::Linear,
         extension_ref,
     )
 }
@@ -101,8 +101,8 @@ impl MakeOpDef for FutureOpDef {
     }
 
     fn init_signature(&self, extension_ref: &Weak<Extension>) -> SignatureFunc {
-        let t_param = TypeParam::from(TypeBound::Any);
-        let t_type = Type::new_var_use(0, TypeBound::Any);
+        let t_param = TypeParam::from(TypeBound::Linear);
+        let t_type = Type::new_var_use(0, TypeBound::Linear);
         let future_type = Type::new_extension(future_custom_type(t_type.clone(), extension_ref));
         match self {
             FutureOpDef::Read => {
@@ -148,7 +148,7 @@ impl HasConcrete for FutureOpDef {
 
     fn instantiate(&self, type_args: &[TypeArg]) -> Result<Self::Concrete, OpLoadError> {
         match type_args {
-            [TypeArg::Type { ty }] => Ok(FutureOp {
+            [TypeArg::Runtime(ty)] => Ok(FutureOp {
                 op: *self,
                 typ: ty.clone(),
             }),
@@ -298,8 +298,8 @@ pub(crate) mod test {
 
     #[test]
     fn circuit() {
-        let t_param = TypeParam::from(TypeBound::Any);
-        let t = Type::new_var_use(0, TypeBound::Any);
+        let t_param = TypeParam::from(TypeBound::Linear);
+        let t = Type::new_var_use(0, TypeBound::Linear);
         let future_type = future_type(t.clone());
 
         let hugr = {

tket2-hseries/src/extension/futures.rs

@@ -205,9 +205,9 @@ impl MakeOpDef for RuntimeBarrierDef {
 
     fn init_signature(&self, _extension_ref: &Weak<Extension>) -> SignatureFunc {
         PolyFuncType::new(
-            [TypeParam::max_nat()],
+            [TypeParam::max_nat_type()],
             Signature::new_endo(
-                array_type_parametric(TypeArg::new_var_use(0, TypeParam::max_nat()), qb_t())
+                array_type_parametric(TypeArg::new_var_use(0, TypeParam::max_nat_type()), qb_t())
                     .unwrap(),
             ),
         )
@@ -534,7 +534,7 @@ pub(crate) fn runtime_barrier_ext_op(
 ) -> Result<ExtensionOp, hugr::extension::SignatureError> {
     ExtensionOp::new(
         EXTENSION.get_op(&RUNTIME_BARRIER_NAME).unwrap().clone(),
-        [TypeArg::BoundedNat { n: array_size }],
+        [TypeArg::BoundedNat(array_size)],
     )
 }