diff options
Diffstat (limited to 'libgo/go/io/multi.go')
| -rw-r--r-- | libgo/go/io/multi.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libgo/go/io/multi.go b/libgo/go/io/multi.go index 16860aa..ed05cac 100644 --- a/libgo/go/io/multi.go +++ b/libgo/go/io/multi.go @@ -10,6 +10,13 @@ type multiReader struct { func (mr *multiReader) Read(p []byte) (n int, err error) { for len(mr.readers) > 0 { + // Optimization to flatten nested multiReaders (Issue 13558) + if len(mr.readers) == 1 { + if r, ok := mr.readers[0].(*multiReader); ok { + mr.readers = r.readers + continue + } + } n, err = mr.readers[0].Read(p) if n > 0 || err != EOF { if err == EOF { @@ -25,7 +32,7 @@ func (mr *multiReader) Read(p []byte) (n int, err error) { } // MultiReader returns a Reader that's the logical concatenation of -// the provided input readers. They're read sequentially. Once all +// the provided input readers. They're read sequentially. Once all // inputs have returned EOF, Read will return EOF. If any of the readers // return a non-nil, non-EOF error, Read will return that error. func MultiReader(readers ...Reader) Reader { |