refactor(hugr-model)!: Reexport indexmap, bumpalo, and fxhash from hugr-model

hugr-core/Cargo.toml

@@ -54,9 +54,6 @@ strum = { workspace = true }
 strum_macros = { workspace = true }
 semver = { version = "1.0.23", features = ["serde"] }
 hugr-model = { version = "0.16.0", path = "../hugr-model", optional = true }
-indexmap.workspace = true
-fxhash.workspace = true
-bumpalo = { workspace = true, features = ["collections"] }
 
 [dev-dependencies]
 rstest = { workspace = true }

hugr-core/src/export.rs

@@ -11,9 +11,14 @@ use crate::{
     },
     Direction, Hugr, HugrView, IncomingPort, Node, Port,
 };
-use bumpalo::{collections::String as BumpString, collections::Vec as BumpVec, Bump};
-use fxhash::FxHashMap;
-use hugr_model::v0::{self as model};
+use hugr_model::v0::{
+    self as model,
+    bumpalo::{
+        collections::{String as BumpString, Vec as BumpVec},
+        Bump,
+    },
+    fxhash::FxHashMap,
+};
 use std::fmt::Write;
 
 pub(crate) const OP_FUNC_CALL_INDIRECT: &str = "func.call-indirect";
@@ -1148,7 +1153,7 @@ mod test {
     #[rstest]
     #[case(test_simple_circuit())]
     fn test_export(#[case] hugr: Hugr) {
-        use bumpalo::Bump;
+        use hugr_model::v0::bumpalo::Bump;
         let bump = Bump::new();
         let _model = super::export_hugr(&hugr, &bump);
     }

hugr-core/src/import.rs

@@ -22,8 +22,7 @@ use crate::{
     },
     Direction, Hugr, HugrView, Node, Port,
 };
-use fxhash::FxHashMap;
-use hugr_model::v0::{self as model};
+use hugr_model::v0::{self as model, fxhash::FxHashMap};
 use itertools::Either;
 use smol_str::{SmolStr, ToSmolStr};
 use thiserror::Error;

hugr-core/tests/model.rs

@@ -5,7 +5,7 @@ use hugr_core::{export::export_hugr, import::import_hugr};
 use hugr_model::v0 as model;
 
 fn roundtrip(source: &str) -> String {
-    let bump = bumpalo::Bump::new();
+    let bump = model::bumpalo::Bump::new();
     let parsed_model = model::text::parse(source, &bump).unwrap();
     let imported_hugr = import_hugr(&parsed_model.module, &std_reg()).unwrap();
     let exported_model = export_hugr(&imported_hugr, &bump);

hugr-model/Cargo.toml

@@ -19,7 +19,7 @@ bench = false
 base64 = { workspace = true }
 bumpalo = { workspace = true, features = ["collections"] }
 capnp = "0.20.1"
-derive_more = { version = "1.0.0", features = ["display"] }
+derive_more = { version = "1.0.0", features = ["display", "from", "error"] }
 fxhash.workspace = true
 indexmap.workspace = true
 pest = "2.7.12"

hugr-model/src/v0/binary/mod.rs

@@ -2,5 +2,5 @@
 mod read;
 mod write;
 
-pub use read::read_from_slice;
+pub use read::{read_from_slice, ReadError};
 pub use write::write_to_vec;

hugr-model/src/v0/binary/read.rs

@@ -3,7 +3,16 @@ use crate::v0 as model;
 use bumpalo::collections::Vec as BumpVec;
 use bumpalo::Bump;
 
-type ReadResult<T> = Result<T, capnp::Error>;
+/// An error encounted while deserialising a model.
+#[derive(Debug, derive_more::From, derive_more::Display, derive_more::Error)]
+#[non_exhaustive]
+pub enum ReadError {
+    #[from(forward)]
+    /// An error encounted while decoding a model from a `capnproto` buffer.
+    DecodingError(capnp::Error),
+}
+
+type ReadResult<T> = Result<T, ReadError>;
 
 /// Read a hugr module from a byte slice.
 pub fn read_from_slice<'a>(slice: &[u8], bump: &'a Bump) -> ReadResult<model::Module<'a>> {

hugr-model/src/v0/mod.rs

@@ -123,6 +123,10 @@ pub mod binary;
 pub mod scope;
 pub mod text;
 
+pub use bumpalo;
+pub use fxhash;
+pub use indexmap;
+
 macro_rules! define_index {
     ($(#[$meta:meta])* $vis:vis struct $name:ident(pub u32);) => {
         #[repr(transparent)]

hugr-model/src/v0/text/parse.rs

@@ -1,13 +1,16 @@
 use base64::{prelude::BASE64_STANDARD, Engine};
-use bumpalo::{collections::String as BumpString, collections::Vec as BumpVec, Bump};
-use fxhash::FxHashMap;
 use pest::{
     iterators::{Pair, Pairs},
     Parser, RuleType,
 };
 use thiserror::Error;
 
 use crate::v0::{
+    bumpalo::{
+        collections::{String as BumpString, Vec as BumpVec},
+        Bump,
+    },
+    fxhash::FxHashMap,
     scope::{LinkTable, SymbolTable, UnknownSymbolError, VarTable},
     AliasDecl, ConstructorDecl, ExtSetPart, FuncDecl, LinkIndex, ListPart, Module, Node, NodeId,
     Operation, OperationDecl, Param, ParamSort, Region, RegionId, RegionKind, RegionScope,

hugr-model/tests/binary.rs

@@ -1,7 +1,7 @@
 #![allow(missing_docs)]
 
-use bumpalo::Bump;
 use hugr_model::v0 as model;
+use model::bumpalo::Bump;
 use pretty_assertions::assert_eq;
 
 /// Reads a module from a string, serializes it to binary, and then deserializes it back to a module.

hugr-model/tests/text.rs

@@ -3,7 +3,7 @@
 use hugr_model::v0 as model;
 
 fn roundtrip(source: &str) -> String {
-    let bump = bumpalo::Bump::new();
+    let bump = model::bumpalo::Bump::new();
     let parsed_model = model::text::parse(source, &bump).unwrap();
     model::text::print_to_string(&parsed_model.module, 80).unwrap()
 }