Merge remote-tracking branch 'origin/main' into refactor/customop

CQCL · Apr 12, 2024 · b075dca · b075dca
2 parents 875b874 + 3598913
commit b075dca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/hugr/src/ops/custom.rs b/hugr/src/ops/custom.rs
@@ -17,9 +17,9 @@ use super::{OpName, OpTrait, OpType};
 
 /// A user-defined operation defined in an extension.
 ///
-/// Any custom operation can be encoded as a serializable [`OpaqueOp`].
-/// If the operation's extension is loaded in the current context, the operation
-/// can be resolved to an executable [`ExtensionOp`].
+/// Any custom operation can be encoded as a serializable [`OpaqueOp`]. If the
+/// operation's extension is loaded in the current context, the operation can be
+/// resolved into an [`ExtensionOp`] containing a reference to its definition.
 ///
 ///   [`OpaqueOp`]: crate::ops::custom::OpaqueOp
 ///   [`ExtensionOp`]: crate::ops::custom::ExtensionOp

diff --git a/specification/hugr.md b/specification/hugr.md
@@ -1988,7 +1988,7 @@ The "Root" row of the table applies to whichever node is the HUGR root,
 including `Module`.
 
 | Node type      | `Value` | `Order` | `Const` | `Function` | `ControlFlow` | `Hierarchy` | Children |
-| -------------- | ------- | ------- |-------- | ---------- | ------------- | ----------- | -------- |
+|----------------|---------|---------|---------|------------|---------------|-------------|----------|
 | Root           | 0, 0    | 0, 0    | 0, 0    | 0, 0       | 0, 0          | 0, ✱        |          |
 | `FuncDefn`     | 0, 0    | 0, 0    | 0, 0    | 0, *       | 0, 0          | 1, +        | DSG      |
 | `FuncDecl`     | 0, 0    | 0, 0    | 0, 0    | 0, *       | 0, 0          | 1, 0        |          |
@@ -2006,12 +2006,12 @@ including `Module`.
 | `TailLoop`     | ✱, ✱    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, +        | DSG      |
 | `Conditional`  | ✱, ✱    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, +        | `Case`   |
 | `Case`         | 0, 0    | 0, 0    | 0, 0    | 0, 0       | 0, 0          | 1, +        | DSG      |
-| `CustomOp`       | ✱, ✱    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
-| `Noop`       | 1, 1    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
-| `MakeTuple`       | ✱, 1    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
-| `UnpackTuple`       | 1, ✱    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
-| `Tag`       | 1, 1    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
-| `Lift`       | ✱, ✱    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
+| `CustomOp`     | ✱, ✱    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
+| `Noop`         | 1, 1    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
+| `MakeTuple`    | ✱, 1    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
+| `UnpackTuple`  | 1, ✱    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
+| `Tag`          | 1, 1    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
+| `Lift`         | ✱, ✱    | ✱, ✱    | 0, 0    | 0, 0       | 0, 0          | 1, 0        |          |
 
 ### Appendix 3: Binary `compute_signature`