toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5787 from thaJeztah/jsonstream_noshadow

Browse Source 
jsonstream: Display: rename var that shadowed type
This commit is contained in:
Sebastiaan van Stijn
2025-02-03 17:45:07 +01:00
committed by GitHub
parent 4771abac9e 8169a5142b
commit ac13f502c6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/internal/jsonstream/display.go
+3 -3
View File
@@ -51,8 +51,8 @@ func Display(ctx context.Context, in io.Reader, stream Stream, opts ...Options)
return ctx.Err()
}
ctxReader := &ctxReader{err: make(chan error, 1), r: in}
stopFunc := context.AfterFunc(ctx, func() { ctxReader.err <- ctx.Err() })
reader := &ctxReader{err: make(chan error, 1), r: in}
stopFunc := context.AfterFunc(ctx, func() { reader.err <- ctx.Err() })
defer stopFunc()
o := options{}
@@ -60,7 +60,7 @@ func Display(ctx context.Context, in io.Reader, stream Stream, opts ...Options)
opt(&o)
}
if err := jsonmessage.DisplayJSONMessagesStream(ctxReader, stream, stream.FD(), stream.IsTerminal(), o.AuxCallback); err != nil {
if err := jsonmessage.DisplayJSONMessagesStream(reader, stream, stream.FD(), stream.IsTerminal(), o.AuxCallback); err != nil {
return err
}