Skip to content

Commit ac13f50

Browse files
authored
Merge pull request #5787 from thaJeztah/jsonstream_noshadow
jsonstream: Display: rename var that shadowed type
2 parents 4771aba + 8169a51 commit ac13f50

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

cli/internal/jsonstream/display.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ func Display(ctx context.Context, in io.Reader, stream Stream, opts ...Options)
5151
return ctx.Err()
5252
}
5353

54-
ctxReader := &ctxReader{err: make(chan error, 1), r: in}
55-
stopFunc := context.AfterFunc(ctx, func() { ctxReader.err <- ctx.Err() })
54+
reader := &ctxReader{err: make(chan error, 1), r: in}
55+
stopFunc := context.AfterFunc(ctx, func() { reader.err <- ctx.Err() })
5656
defer stopFunc()
5757

5858
o := options{}
5959
for _, opt := range opts {
6060
opt(&o)
6161
}
6262

63-
if err := jsonmessage.DisplayJSONMessagesStream(ctxReader, stream, stream.FD(), stream.IsTerminal(), o.AuxCallback); err != nil {
63+
if err := jsonmessage.DisplayJSONMessagesStream(reader, stream, stream.FD(), stream.IsTerminal(), o.AuxCallback); err != nil {
6464
return err
6565
}
6666

0 commit comments

Comments
 (0)