fix!: Replace LoadFunction::signature with `LoadFunction::instantia…

…tion` Closes #1755 BREAKING CHANGE: The `LoadFunction::signature` field is removed. Replace uses with `DataflowOpTrait::signature()`.
CQCL · Dec 10, 2024 · 802d361 · 802d361
1 parent 97e4625
commit 802d361
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/hugr-core/src/extension/resolution/types.rs b/hugr-core/src/extension/resolution/types.rs
@@ -53,7 +53,7 @@ pub fn update_op_types_extensions(
         }
         OpType::LoadFunction(lf) => {
             update_signature_exts(node, lf.func_sig.body_mut(), extensions, used_extensions)?;
-            update_signature_exts(node, &mut lf.signature, extensions, used_extensions)?;
+            update_signature_exts(node, &mut lf.instantiation, extensions, used_extensions)?;
         }
         OpType::DFG(dfg) => {
             update_signature_exts(node, &mut dfg.signature, extensions, used_extensions)?

diff --git a/hugr-core/src/ops/dataflow.rs b/hugr-core/src/ops/dataflow.rs
@@ -5,7 +5,7 @@ use super::{impl_op_name, OpTag, OpTrait};
 use crate::extension::{ExtensionRegistry, ExtensionSet, SignatureError};
 use crate::ops::StaticTag;
 use crate::types::{EdgeKind, PolyFuncType, Signature, Type, TypeArg, TypeRow};
-use crate::IncomingPort;
+use crate::{type_row, IncomingPort};
 
 #[cfg(test)]
 use ::proptest_derive::Arbitrary;
@@ -341,7 +341,7 @@ pub struct LoadFunction {
     /// The type arguments that instantiate `func_sig`.
     pub type_args: Vec<TypeArg>,
     /// The instantiation of `func_sig`.
-    pub signature: Signature, // Cache, so we can fail in try_new() not in signature()
+    pub instantiation: Signature, // Cache, so we can fail in try_new() not in signature()
 }
 impl_op_name!(LoadFunction);
 impl DataflowOpTrait for LoadFunction {
@@ -352,7 +352,7 @@ impl DataflowOpTrait for LoadFunction {
     }
 
     fn signature(&self) -> Signature {
-        self.signature.clone()
+        Signature::new(type_row![], Type::new_function(self.instantiation.clone()))
     }
 
     fn static_input(&self) -> Option<EdgeKind> {
@@ -371,11 +371,10 @@ impl LoadFunction {
     ) -> Result<Self, SignatureError> {
         let type_args = type_args.into();
         let instantiation = func_sig.instantiate(&type_args, exts)?;
-        let signature = Signature::new(TypeRow::new(), vec![Type::new_function(instantiation)]);
         Ok(Self {
             func_sig,
             type_args,
-            signature,
+            instantiation,
         })
     }
 
@@ -404,12 +403,12 @@ impl LoadFunction {
             self.type_args.clone(),
             extension_registry,
         )?;
-        if other.signature == self.signature {
+        if other.instantiation == self.instantiation {
             Ok(())
         } else {
             Err(SignatureError::LoadFunctionIncorrectlyAppliesType {
-                cached: self.signature.clone(),
-                expected: other.signature.clone(),
+                cached: self.instantiation.clone(),
+                expected: other.instantiation.clone(),
             })
         }
     }