Skip to content

Commit 9a77e88

Browse files
rvolosatovsrvolosatovs
committed
refactor(go): ReceiveCloser -> Receiver
Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
1 parent 68e7fdb commit 9a77e88

7 files changed

Lines changed: 22 additions & 26 deletions

File tree

‎crates/wit-bindgen-go/src/interface.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ impl InterfaceGenerator<'_> {
985985

986986
uwrite!(
987987
self.src,
988-
r#"func(r {wrpc}.IndexReader, path ...uint32) ({wrpc}.ReceiveCloser["#
988+
r#"func(r {wrpc}.IndexReader, path ...uint32) ({wrpc}.Receiver["#
989989
);
990990
self.print_opt_ty(ty, true);
991991
uwrite!(
@@ -1108,7 +1108,7 @@ impl InterfaceGenerator<'_> {
11081108

11091109
uwrite!(
11101110
self.src,
1111-
r#"func(r {wrpc}.IndexReader, path ...uint32) ({wrpc}.ReceiveCloser["#
1111+
r#"func(r {wrpc}.IndexReader, path ...uint32) ({wrpc}.Receiver["#
11121112
);
11131113
self.print_list(ty);
11141114
uwrite!(
@@ -1990,7 +1990,7 @@ impl InterfaceGenerator<'_> {
19901990
let io = self.deps.io();
19911991
let slog = self.deps.slog();
19921992
let wrpc = self.deps.wrpc();
1993-
uwrite!(self.src, "func(v {wrpc}.ReceiveCloser[",);
1993+
uwrite!(self.src, "func(v {wrpc}.Receiver[",);
19941994
self.print_opt_ty(ty, true);
19951995
uwrite!(
19961996
self.src,
@@ -2105,7 +2105,7 @@ impl InterfaceGenerator<'_> {
21052105
let slog = self.deps.slog();
21062106
let sync = self.deps.sync();
21072107
let wrpc = self.deps.wrpc();
2108-
uwrite!(self.src, "func(v {wrpc}.ReceiveCloser[",);
2108+
uwrite!(self.src, "func(v {wrpc}.Receiver[",);
21092109
self.print_list(ty);
21102110
uwrite!(
21112111
self.src,
@@ -3179,7 +3179,7 @@ func ServeInterface(s {wrpc}.Server, h Handler) (stop func() error, err error) {
31793179
Some(ty) => {
31803180
let wrpc = self.deps.wrpc();
31813181
self.push_str(wrpc);
3182-
self.push_str(".ReceiveCloser[");
3182+
self.push_str(".Receiver[");
31833183
self.print_opt_ty(ty, true);
31843184
self.push_str("]");
31853185
}
@@ -3199,7 +3199,7 @@ func ServeInterface(s {wrpc}.Server, h Handler) (stop func() error, err error) {
31993199
Some(ty) => {
32003200
let wrpc = self.deps.wrpc();
32013201
self.push_str(wrpc);
3202-
self.push_str(".ReceiveCloser[");
3202+
self.push_str(".Receiver[");
32033203
self.print_list(ty);
32043204
self.push_str("]");
32053205
}

‎examples/go/streams-client/bindings/wrpc_examples/streams/handler/bindings.wrpc.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
type Req struct {
19-
Numbers wrpc.ReceiveCloser[[]uint64]
19+
Numbers wrpc.Receiver[[]uint64]
2020
Bytes io.ReadCloser
2121
}
2222

@@ -25,7 +25,7 @@ func (v *Req) String() string { return "Req" }
2525
func (v *Req) WriteToIndex(w wrpc.ByteWriter) (func(wrpc.IndexWriter) error, error) {
2626
writes := make(map[uint32]func(wrpc.IndexWriter) error, 2)
2727
slog.Debug("writing field", "name", "numbers")
28-
write0, err := func(v wrpc.ReceiveCloser[[]uint64], w interface {
28+
write0, err := func(v wrpc.Receiver[[]uint64], w interface {
2929
io.ByteWriter
3030
io.Writer
3131
}) (write func(wrpc.IndexWriter) error, err error) {
@@ -201,7 +201,7 @@ func (v *Req) WriteToIndex(w wrpc.ByteWriter) (func(wrpc.IndexWriter) error, err
201201
}
202202
return nil, nil
203203
}
204-
func Echo(ctx__ context.Context, wrpc__ wrpc.Invoker, r *Req) (r0__ wrpc.ReceiveCloser[[]uint64], r1__ io.ReadCloser, writeErrs__ <-chan error, err__ error) {
204+
func Echo(ctx__ context.Context, wrpc__ wrpc.Invoker, r *Req) (r0__ wrpc.Receiver[[]uint64], r1__ io.ReadCloser, writeErrs__ <-chan error, err__ error) {
205205
var buf__ bytes.Buffer
206206
var writeCount__ uint32
207207
write0__, err__ := (r).WriteToIndex(&buf__)
@@ -260,7 +260,7 @@ func Echo(ctx__ context.Context, wrpc__ wrpc.Invoker, r *Req) (r0__ wrpc.Receive
260260
if cErr__ := w__.Close(); cErr__ != nil {
261261
slog.DebugContext(ctx__, "failed to close outgoing stream", "instance", "wrpc-examples:streams/handler", "name", "echo", "err", cErr__)
262262
}
263-
r0__, err__ = func(r wrpc.IndexReader, path ...uint32) (wrpc.ReceiveCloser[[]uint64], error) {
263+
r0__, err__ = func(r wrpc.IndexReader, path ...uint32) (wrpc.Receiver[[]uint64], error) {
264264
slog.Debug("reading stream status byte")
265265
status, err := r.ReadByte()
266266
if err != nil {

‎examples/go/streams-server/bindings/exports/wrpc_examples/streams/handler/bindings.wrpc.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
type Req struct {
19-
Numbers wrpc.ReceiveCloser[[]uint64]
19+
Numbers wrpc.Receiver[[]uint64]
2020
Bytes io.ReadCloser
2121
}
2222

@@ -25,7 +25,7 @@ func (v *Req) String() string { return "Req" }
2525
func (v *Req) WriteToIndex(w wrpc.ByteWriter) (func(wrpc.IndexWriter) error, error) {
2626
writes := make(map[uint32]func(wrpc.IndexWriter) error, 2)
2727
slog.Debug("writing field", "name", "numbers")
28-
write0, err := func(v wrpc.ReceiveCloser[[]uint64], w interface {
28+
write0, err := func(v wrpc.Receiver[[]uint64], w interface {
2929
io.ByteWriter
3030
io.Writer
3131
}) (write func(wrpc.IndexWriter) error, err error) {
@@ -203,7 +203,7 @@ func (v *Req) WriteToIndex(w wrpc.ByteWriter) (func(wrpc.IndexWriter) error, err
203203
}
204204

205205
type Handler interface {
206-
Echo(ctx__ context.Context, r *Req) (wrpc.ReceiveCloser[[]uint64], io.ReadCloser, error)
206+
Echo(ctx__ context.Context, r *Req) (wrpc.Receiver[[]uint64], io.ReadCloser, error)
207207
}
208208

209209
func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) {
@@ -228,7 +228,7 @@ func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) {
228228
v := &Req{}
229229
var err error
230230
slog.Debug("reading field", "name", "numbers")
231-
v.Numbers, err = func(r wrpc.IndexReader, path ...uint32) (wrpc.ReceiveCloser[[]uint64], error) {
231+
v.Numbers, err = func(r wrpc.IndexReader, path ...uint32) (wrpc.Receiver[[]uint64], error) {
232232
slog.Debug("reading stream status byte")
233233
status, err := r.ReadByte()
234234
if err != nil {
@@ -463,7 +463,7 @@ func ServeInterface(s wrpc.Server, h Handler) (stop func() error, err error) {
463463
var buf bytes.Buffer
464464
writes := make(map[uint32]func(wrpc.IndexWriter) error, 2)
465465

466-
write0, err := func(v wrpc.ReceiveCloser[[]uint64], w interface {
466+
write0, err := func(v wrpc.Receiver[[]uint64], w interface {
467467
io.ByteWriter
468468
io.Writer
469469
}) (write func(wrpc.IndexWriter) error, err error) {

‎go/future.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func ReadFutureStatus(r ByteReader) (bool, error) {
2424
}
2525

2626
// ReadFuture reads a future from `r`
27-
func ReadFuture[T any](r IndexReader, f func(IndexReader) (T, error), path ...uint32) (ReceiveCloser[T], error) {
27+
func ReadFuture[T any](r IndexReader, f func(IndexReader) (T, error), path ...uint32) (Receiver[T], error) {
2828
slog.Debug("reading future status byte")
2929
ok, err := ReadFutureStatus(r)
3030
if err != nil {

‎go/stream.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func ReadByteStream(r IndexReader, path ...uint32) (io.ReadCloser, error) {
144144
}
145145

146146
// ReadStream reads a stream from `r`
147-
func ReadStream[T any](r IndexReader, f func(IndexReader) (T, error), path ...uint32) (ReceiveCloser[[]T], error) {
147+
func ReadStream[T any](r IndexReader, f func(IndexReader) (T, error), path ...uint32) (Receiver[[]T], error) {
148148
slog.Debug("reading stream status byte")
149149
ok, err := ReadStreamStatus(r)
150150
if err != nil {

‎go/wrpc.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ type ByteReader interface {
8989

9090
type Receiver[T any] interface {
9191
Receive() (T, error)
92-
}
93-
94-
type ReceiveCloser[T any] interface {
95-
Receiver[T]
9692
io.Closer
9793
}
9894

@@ -141,18 +137,18 @@ func NewDecodeReceiver[T any](r IndexReadCloser, decode func(IndexReader) (T, er
141137
return &DecodeReceiver[T]{r, decode}
142138
}
143139

144-
type nestedReceiver[T any, A ReceiveCloser[B], B ReceiveCloser[T]] struct {
140+
type nestedReceiver[T any, A Receiver[B], B Receiver[T]] struct {
145141
rx A
146142
}
147143

148-
func (r nestedReceiver[T, A, B]) Receive() (ReceiveCloser[T], error) {
144+
func (r nestedReceiver[T, A, B]) Receive() (Receiver[T], error) {
149145
return r.rx.Receive()
150146
}
151147

152148
func (r nestedReceiver[T, A, B]) Close() error {
153149
return r.rx.Close()
154150
}
155151

156-
func NewNestedReceiver[T any, A ReceiveCloser[B], B ReceiveCloser[T]](rx A) ReceiveCloser[ReceiveCloser[T]] {
152+
func NewNestedReceiver[T any, A Receiver[B], B Receiver[T]](rx A) Receiver[Receiver[T]] {
157153
return nestedReceiver[T, A, B]{rx}
158154
}

‎tests/go/async.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
type AsyncHandler struct{}
1515

16-
func (AsyncHandler) WithStreams(ctx context.Context, complete bool) (io.ReadCloser, wrpc.ReceiveCloser[[][]string], error) {
16+
func (AsyncHandler) WithStreams(ctx context.Context, complete bool) (io.ReadCloser, wrpc.Receiver[[][]string], error) {
1717
slog.DebugContext(ctx, "handling `with-streams`", "complete", complete)
1818
buf := io.NopCloser(bytes.NewBuffer([]byte("test")))
1919
str := wrpc.NewCompleteReceiver([][]string{{"foo", "bar"}, {"baz"}})
@@ -24,7 +24,7 @@ func (AsyncHandler) WithStreams(ctx context.Context, complete bool) (io.ReadClos
2424
}
2525
}
2626

27-
func (AsyncHandler) IdentityNestedAsync(ctx context.Context, v wrpc.ReceiveCloser[wrpc.ReceiveCloser[wrpc.ReceiveCloser[wrpc.ReceiveCloser[[]string]]]]) (wrpc.ReceiveCloser[wrpc.ReceiveCloser[wrpc.ReceiveCloser[wrpc.ReceiveCloser[[]string]]]], error) {
27+
func (AsyncHandler) IdentityNestedAsync(ctx context.Context, v wrpc.Receiver[wrpc.Receiver[wrpc.Receiver[wrpc.Receiver[[]string]]]]) (wrpc.Receiver[wrpc.Receiver[wrpc.Receiver[wrpc.Receiver[[]string]]]], error) {
2828
slog.DebugContext(ctx, "handling `identity-nested-async`")
2929
return v, nil
3030
}

0 commit comments

Comments
 (0)