diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2021-08-19 15:42:52 +0300 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2021-08-19 15:43:50 +0300 |
commit | 94af784102bbc4b6cbadf515756ed73b2a3e7a06 (patch) | |
tree | 5af4d37ec5fb5439e9a6d6d3735e3f9d3880d7ae /streamio | |
parent | b3bb31655c67e0fcad90de1c31de58686849a393 (diff) |
Remove streamio ReaderFrom and WriterTo
These were set to be removed in v14.
Changelog: removed
Diffstat (limited to 'streamio')
-rw-r--r-- | streamio/stream.go | 16 | ||||
-rw-r--r-- | streamio/stream_test.go | 53 |
2 files changed, 0 insertions, 69 deletions
diff --git a/streamio/stream.go b/streamio/stream.go index 347f20731..0aab25315 100644 --- a/streamio/stream.go +++ b/streamio/stream.go @@ -40,14 +40,6 @@ func (rr *receiveReader) Read(p []byte) (int, error) { return n, nil } -// wrapReader hides WriteTo to prevent inifinite recursion -type wrapReader struct{ io.Reader } - -func (wr *wrapReader) Read(p []byte) (int, error) { return wr.Reader.Read(p) } - -// Deprecated: will be removed in v14. Use io.Copy instead. -func (rr *receiveReader) WriteTo(w io.Writer) (int64, error) { return io.Copy(w, &wrapReader{rr}) } - // NewWriter turns sender into an io.Writer. The sender callback will // receive []byte arguments of length at most WriteBufferSize. func NewWriter(sender func(p []byte) error) io.Writer { @@ -95,11 +87,3 @@ func (sw *sendWriter) Write(p []byte) (int, error) { return sent, nil } - -// wrapWriter hides ReadFrom to prevent inifinite recursion -type wrapWriter struct{ io.Writer } - -func (ww *wrapWriter) Write(p []byte) (int, error) { return ww.Writer.Write(p) } - -// Deprecated: will be removed in v14. Use io.Copy instead. -func (sw *sendWriter) ReadFrom(r io.Reader) (int64, error) { return io.Copy(&wrapWriter{sw}, r) } diff --git a/streamio/stream_test.go b/streamio/stream_test.go index ee45f7196..2e879ab55 100644 --- a/streamio/stream_test.go +++ b/streamio/stream_test.go @@ -61,29 +61,6 @@ func TestReadSizes(t *testing.T) { }) } -func TestWriterTo(t *testing.T) { - testData := "Hello this is the test data that will be received. It goes on for a while bla bla bla." - testCases := []struct { - desc string - r io.Reader - }{ - {desc: "base", r: strings.NewReader(testData)}, - {desc: "dataerr", r: iotest.DataErrReader(strings.NewReader(testData))}, - {desc: "onebyte", r: iotest.OneByteReader(strings.NewReader(testData))}, - {desc: "dataerr(onebyte)", r: iotest.DataErrReader(iotest.OneByteReader(strings.NewReader(testData)))}, - } - - for _, tc := range testCases { - result := &bytes.Buffer{} - reader := NewReader(receiverFromReader(tc.r)) - n, err := reader.(io.WriterTo).WriteTo(result) - - require.NoError(t, err, tc.desc) - require.Equal(t, int64(len(testData)), n, tc.desc) - require.Equal(t, testData, result.String(), tc.desc) - } -} - func receiverFromReader(r io.Reader) func() ([]byte, error) { return func() ([]byte, error) { data := make([]byte, 10) @@ -151,33 +128,3 @@ func (ts *testSender) send(p []byte) error { ts.sends = append(ts.sends, buf) return nil } - -func TestReadFrom(t *testing.T) { - defer func(oldBufferSize int) { - WriteBufferSize = oldBufferSize - }(WriteBufferSize) - WriteBufferSize = 5 - - testData := "Hello this is the test data that will be received. It goes on for a while bla bla bla." - testCases := []struct { - desc string - r io.Reader - }{ - {desc: "base", r: strings.NewReader(testData)}, - {desc: "dataerr", r: iotest.DataErrReader(strings.NewReader(testData))}, - {desc: "onebyte", r: iotest.OneByteReader(strings.NewReader(testData))}, - {desc: "dataerr(onebyte)", r: iotest.DataErrReader(iotest.OneByteReader(strings.NewReader(testData)))}, - } - - for _, tc := range testCases { - ts := &testSender{} - n, err := NewWriter(ts.send).(io.ReaderFrom).ReadFrom(tc.r) - - require.NoError(t, err, tc.desc) - require.Equal(t, int64(len(testData)), n, tc.desc) - require.Equal(t, testData, string(bytes.Join(ts.sends, nil)), tc.desc) - for _, send := range ts.sends { - require.True(t, len(send) <= WriteBufferSize, "send calls may not exceed WriteBufferSize") - } - } -} |