review suggestions

Author: ss2165

hugr-core/src/envelope.rs

@@ -171,6 +171,12 @@ pub fn read_envelope(
 /// - `reader`: The reader to read the envelope from.
 /// - `registry`: An extension registry with additional extensions to use when
 ///   decoding the HUGR, if they are not already included in the package.
+///
+/// # Errors
+/// - [`ReadError::EnvelopeHeader`] if there was an error reading the envelope header.
+/// - [`ReadError::Payload`] if there was an error reading the package payload,
+///   including a partial description of the envelope read before the error occurred.
+///
 // TODO deprecate and rename to read_envelope when removing old version
 pub fn read_described_envelope(
     reader: impl BufRead,
@@ -384,7 +390,7 @@ pub enum EnvelopeError {
     /// Error raised while checking for breaking extension version mismatch.
     #[deprecated(since = "0.24.1")]
     #[error(transparent)]
-    #[allow(deprecated)]
+    #[expect(deprecated)]
     ExtensionVersion {
         /// The source error.
         #[from]

hugr-core/src/envelope/description.rs

@@ -104,14 +104,15 @@ impl PackageDesc {
         Some(generators.join(", "))
     }
 
-    /// Returns an iterator over the module descriptions.
+    /// Returns an iterator over the module descriptions. Modules with
+    /// expected but missing descriptions yield `None`.
     pub fn modules(&self) -> impl Iterator<Item = &Option<ModuleDesc>> {
         self.modules.iter()
     }
 
-    /// Returns an iterator over the packaged extension descriptions.
-    pub fn packaged_extensions(&self) -> impl Iterator<Item = &Option<ExtensionDesc>> {
-        self.packaged_extensions.iter()
+    /// Returns an iterator over the packaged extension descriptions. Missing extensions are skipped.
+    pub fn packaged_extensions(&self) -> impl Iterator<Item = &ExtensionDesc> {
+        self.packaged_extensions.iter().flatten()
     }
 }
 
@@ -145,7 +146,7 @@ impl<E: AsRef<crate::Extension>> From<&E> for ExtensionDesc {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, serde::Serialize)]
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 /// Description of the entrypoint of a module.
 pub struct Entrypoint {
     /// Node id of the entrypoint.
@@ -184,7 +185,7 @@ where
     serializer.serialize_str(op_string(op_type).as_str())
 }
 
-#[derive(Debug, Clone, PartialEq, Default, serde::Serialize)]
+#[derive(Debug, Clone, PartialEq, Default, serde::Serialize, serde::Deserialize)]
 /// High-level description of a module in a HUGR package.
 pub struct ModuleDesc {
     /// Number of nodes in the module.
@@ -401,11 +402,7 @@ mod test {
     ) {
         empty_package_desc.set_packaged_extension(0, test_extension.clone());
         assert_eq!(
-            empty_package_desc
-                .packaged_extensions()
-                .next()
-                .unwrap()
-                .as_ref(),
+            empty_package_desc.packaged_extensions().next(),
             Some(&test_extension)
         );
     }
@@ -494,7 +491,7 @@ mod test {
 
         let extensions: Vec<_> = empty_package_desc.packaged_extensions().collect();
         assert_eq!(extensions.len(), 1);
-        assert_eq!(extensions[0].as_ref(), Some(&test_extension));
+        assert_eq!(extensions[0], &test_extension);
     }
 
     #[rstest]