feat: Draft for hugr-model with export, import, parsing and pretty printing

.github/change-filters.yml

@@ -6,6 +6,7 @@ rust: &rust
   - "hugr-cli/**"
   - "hugr-core/**"
   - "hugr-passes/**"
+  - "hugr-model/**"
   - "Cargo.toml"
   - "specification/schema/**"
   - ".github/workflows/ci-rs.yml"

Cargo.toml

@@ -3,7 +3,7 @@ lto = "thin"
 
 [workspace]
 resolver = "2"
-members = ["hugr", "hugr-core", "hugr-passes", "hugr-cli"]
+members = ["hugr", "hugr-core", "hugr-passes", "hugr-cli", "hugr-model"]
 
 [workspace.package]
 rust-version = "1.75"
@@ -62,6 +62,9 @@ clap-verbosity-flag = "2.2.0"
 assert_cmd = "2.0.14"
 assert_fs = "1.1.1"
 predicates = "3.1.0"
+indexmap = "2.3.0"
+fxhash = "0.2.1"
+bumpalo = { version = "3.16.0" }
 
 [profile.dev.package]
 insta.opt-level = 3

devenv.nix

@@ -21,6 +21,7 @@ in
       # cargo-llvm-cov is currently marked broken on nixpkgs unstable
       pkgs-stable.cargo-llvm-cov
       pkgs.graphviz
+      pkgs.cargo-insta
     ] ++ lib.optionals
       pkgs.stdenv.isDarwin
       (with pkgs.darwin.apple_sdk; [

hugr-core/Cargo.toml

@@ -19,6 +19,11 @@ workspace = true
 [features]
 extension_inference = []
 declarative = ["serde_yaml"]
+model_unstable = ["hugr-model"]
+
+[[test]]
+name = "model"
+required-features = ["model_unstable"]
 
 [dependencies]
 portgraph = { workspace = true, features = ["serde", "petgraph"] }
@@ -32,7 +37,7 @@ serde = { workspace = true, features = ["derive", "rc"] }
 serde_yaml = { workspace = true, optional = true }
 typetag = { workspace = true }
 smol_str = { workspace = true, features = ["serde"] }
-derive_more = { workspace = true, features=["display", "from"]}
+derive_more = { workspace = true, features = ["display", "from"] }
 itertools = { workspace = true }
 html-escape = { workspace = true }
 bitvec = { workspace = true, features = ["serde"] }
@@ -46,6 +51,10 @@ paste = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
 semver = { version = "1.0.23", features = ["serde"] }
+hugr-model = { path = "../hugr-model", optional = true }
+indexmap.workspace = true
+fxhash.workspace = true
+bumpalo = { workspace = true, features = ["collections"] }
 
 [dev-dependencies]
 rstest = { workspace = true }
@@ -61,3 +70,4 @@ regex-syntax = { workspace = true }
 
 # Required for documentation examples
 hugr = { path = "../hugr" }
+serde_yaml = "0.9.34"

hugr-core/README.md

@@ -21,6 +21,9 @@ Please read the [API documentation here][].
   Not enabled by default.
 - `declarative`:
   Experimental support for declaring extensions in YAML files, support is limited.
+- `model_unstable`
+  Import and export from the representation defined in the `hugr-model` crate.
+  Unstable and subject to change. Not enabled by default.
 
 ## Recent Changes
 

hugr-core/src/builder.rs

@@ -263,7 +263,7 @@ pub(crate) mod test {
         dataflow_builder.finish_with_outputs(w)
     }
 
-    pub(super) fn build_main(
+    pub(crate) fn build_main(
         signature: PolyFuncType,
         f: impl FnOnce(FunctionBuilder<&mut Hugr>) -> Result<BuildHandle<FuncID<true>>, BuildError>,
     ) -> Result<Hugr, BuildError> {