Merge pull request #276 from zenhack/embed-client

Embed capnp.Client in generated interface types.
capnproto · Jul 30, 2022 · a609dc7 · a609dc7
2 parents 32723ce + c74c17b
commit a609dc7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 42 deletions.
diff --git a/capnpc-go/templates/interfaceClient b/capnpc-go/templates/interfaceClient
@@ -1,7 +1,7 @@
 {{with .Annotations.Doc -}}
 // {{.}}
 {{end -}}
-type {{.Node.Name}} struct { Client {{.G.Capnp}}.Client }
+type {{.Node.Name}} struct { {{.G.Capnp}}.Client }
 
 {{ template "_typeid" .Node }}
 
@@ -26,7 +26,3 @@ func (c {{$.Node.Name}}) AddRef() {{$.Node.Name}} {
 		Client: c.Client.AddRef(),
 	}
 }
-
-func (c {{$.Node.Name}}) Release() {
-	c.Client.Release()
-}
diff --git a/internal/aircraftlib/aircraft.capnp.go b/internal/aircraftlib/aircraft.capnp.go
diff --git a/list.go b/list.go
@@ -1037,7 +1037,7 @@ func (s StructList[T]) String() string {
 	return buf.String()
 }
 
-type CapList[T ~struct{ Client Client }] PointerList
+type CapList[T ~struct{ Client }] PointerList
 
 func (c CapList[T]) At(i int) (T, error) {
 	ptr, err := PointerList(c).At(i)
@@ -1050,7 +1050,7 @@ func (c CapList[T]) At(i int) (T, error) {
 func (c CapList[T]) Set(i int, v T) error {
 	pl := PointerList(c)
 	seg := pl.List.Segment()
-	capId := seg.Message().AddCap(struct{ Client Client }(v).Client)
+	capId := seg.Message().AddCap(struct{ Client }(v).Client)
 	return pl.Set(i, NewInterface(seg, capId).ToPtr())
 }
 

diff --git a/rpc/internal/testcapnp/test.capnp.go b/rpc/internal/testcapnp/test.capnp.go
diff --git a/std/capnp/persistent/persistent.capnp.go b/std/capnp/persistent/persistent.capnp.go