Formatting and fixed benches.

Author: zrho

hugr-py/src/hugr/envelope.py

@@ -64,7 +64,9 @@ def make_envelope(package: Package, config: EnvelopeConfig) -> bytes:
 
         case EnvelopeFormat.MODULE_WITH_EXTS:
             package_bytes = bytes(package.to_model())
-            extension_str = json.dumps([ext._to_serial().model_dump(mode = 'json') for ext in package.extensions])
+            extension_str = json.dumps(
+                [ext._to_serial().model_dump(mode="json") for ext in package.extensions]
+            )
             extension_bytes = extension_str.encode("utf8")
             payload = package_bytes + extension_bytes
 

hugr/benches/benchmarks/hugr.rs

@@ -31,14 +31,17 @@ struct CapnpSer;
 impl Serializer for CapnpSer {
     fn serialize(&self, hugr: &Hugr) -> Vec<u8> {
         let bump = bumpalo::Bump::new();
-        let module = hugr_core::export::export_hugr(hugr, &bump);
-        hugr_model::v0::binary::write_to_vec(&module)
+        let module = hugr.to_model(&bump);
+        let package = hugr_model::v0::table::Package {
+            modules: vec![module],
+        };
+        hugr_model::v0::binary::write_to_vec(&package)
     }
 
     fn deserialize(&self, bytes: &[u8]) -> Hugr {
         let bump = bumpalo::Bump::new();
-        let module = hugr_model::v0::binary::read_from_slice(bytes, &bump).unwrap();
-        hugr_core::import::import_hugr(&module, &STD_REG).unwrap()
+        let package = hugr_model::v0::binary::read_from_slice(bytes, &bump).unwrap();
+        Hugr::from_model(&package.modules[0], &STD_REG).unwrap()
     }
 }