1 files changed, 7 insertions, 7 deletions

diff --git a/lib9p/idl.gen b/lib9p/idl.gen
index 779b6d5..b75ffd6 100755
--- a/lib9p/idl.gen
+++ b/lib9p/idl.gen
@@ -147,8 +147,8 @@ def ifdef_pop(n: int) -> str:
 # topo_sorted() ################################################################
 
 
-def topo_sorted(typs: list[idl.Type]) -> typing.Iterable[idl.Type]:
-    ts: graphlib.TopologicalSorter[idl.Type] = graphlib.TopologicalSorter()
+def topo_sorted(typs: list[idl.UserType]) -> typing.Iterable[idl.UserType]:
+    ts: graphlib.TopologicalSorter[idl.UserType] = graphlib.TopologicalSorter()
     for typ in typs:
         match typ:
             case idl.Number():
@@ -375,7 +375,7 @@ def get_buffer_size(typ: idl.Type, version: str) -> BufferSize:
 # Generate .h ##################################################################
 
 
-def gen_h(versions: set[str], typs: list[idl.Type]) -> str:
+def gen_h(versions: set[str], typs: list[idl.UserType]) -> str:
     global _ifdef_stack
     _ifdef_stack = []
 
@@ -451,7 +451,7 @@ enum {idprefix}version {{
 """
 
     def per_version_comment(
-        typ: idl.Type, fn: typing.Callable[[idl.Type, str], str]
+        typ: idl.UserType, fn: typing.Callable[[idl.UserType, str], str]
     ) -> str:
         lines: dict[str, str] = {}
         for version in sorted(typ.in_versions):
@@ -471,7 +471,7 @@ enum {idprefix}version {{
         ret += "\n"
         ret += ifdef_push(1, c_ver_ifdef(typ.in_versions))
 
-        def sum_size(typ: idl.Type, version: str) -> str:
+        def sum_size(typ: idl.UserType, version: str) -> str:
             sz = get_buffer_size(typ, version)
             assert (
                 sz.min_size <= sz.exp_size
@@ -643,7 +643,7 @@ enum {idprefix}version {{
 # Generate .c ##################################################################
 
 
-def gen_c(versions: set[str], typs: list[idl.Type]) -> str:
+def gen_c(versions: set[str], typs: list[idl.UserType]) -> str:
     global _ifdef_stack
     _ifdef_stack = []
 
@@ -1088,7 +1088,7 @@ LM_ALWAYS_INLINE static void unmarshal_8(struct _unmarshal_ctx *ctx, uint64_t *o
 
     type OffsetExprRecursion = typing.Callable[[Path], WalkCmd]
 
-    def get_offset_expr(typ: idl.Type, recurse: OffsetExprRecursion) -> OffsetExpr:
+    def get_offset_expr(typ: idl.UserType, recurse: OffsetExprRecursion) -> OffsetExpr:
         if not isinstance(typ, idl.Struct):
             assert typ.static_size
             ret = OffsetExpr()