Remove deprecated io/ioutil usage

Author: mostynb

internal/klauspost_snappy/klauspost_snappy.go

@@ -30,7 +30,6 @@ package klauspost_snappy
 
 import (
 	"io"
-	"io/ioutil"
 	"sync"
 
 	snappylib "github.com/klauspost/compress/s2"
@@ -61,7 +60,7 @@ func PretendInit(clobbering bool) {
 
 	c := &compressor{}
 	c.poolCompressor.New = func() interface{} {
-		w := snappylib.NewWriter(ioutil.Discard, snappylib.WriterSnappyCompat())
+		w := snappylib.NewWriter(io.Discard, snappylib.WriterSnappyCompat())
 		return &writer{Writer: w, pool: &c.poolCompressor}
 	}
 	encoding.RegisterCompressor(c)

internal/klauspost_snappy/klauspost_snappy_test.go

@@ -21,7 +21,7 @@ package klauspost_snappy
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
+	"io"
 	"net"
 	"testing"
 
@@ -58,7 +58,7 @@ func TestRegisteredCompression(t *testing.T) {
 
 	r, err := comp.Decompress(buf)
 	require.NoError(t, err)
-	expected, err := ioutil.ReadAll(r)
+	expected, err := io.ReadAll(r)
 	require.NoError(t, err)
 
 	assert.Equal(t, message, string(expected))

internal/lz4/lz4.go

@@ -24,7 +24,6 @@ package lz4
 
 import (
 	"io"
-	"io/ioutil"
 	"sync"
 
 	lz4lib "github.com/pierrec/lz4/v4"
@@ -55,7 +54,7 @@ func PretendInit(clobbering bool) {
 
 	c := &compressor{}
 	c.poolCompressor.New = func() interface{} {
-		w := lz4lib.NewWriter(ioutil.Discard)
+		w := lz4lib.NewWriter(io.Discard)
 		return &writer{Writer: w, pool: &c.poolCompressor}
 	}
 	encoding.RegisterCompressor(c)

internal/lz4/lz4_test.go

@@ -21,7 +21,7 @@ package lz4
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
+	"io"
 	"net"
 	"testing"
 
@@ -58,7 +58,7 @@ func TestRegisteredCompression(t *testing.T) {
 
 	r, err := comp.Decompress(buf)
 	require.NoError(t, err)
-	expected, err := ioutil.ReadAll(r)
+	expected, err := io.ReadAll(r)
 	require.NoError(t, err)
 
 	assert.Equal(t, message, string(expected))

internal/s2/s2.go

@@ -18,7 +18,6 @@ package s2
 
 import (
 	"io"
-	"io/ioutil"
 	"sync"
 
 	"github.com/klauspost/compress/s2"
@@ -49,7 +48,7 @@ func PretendInit(clobbering bool) {
 
 	c := &compressor{}
 	c.poolCompressor.New = func() interface{} {
-		w := s2.NewWriter(ioutil.Discard, s2.WriterConcurrency(1))
+		w := s2.NewWriter(io.Discard, s2.WriterConcurrency(1))
 		return &writer{Writer: w, pool: &c.poolCompressor}
 	}
 	encoding.RegisterCompressor(c)

internal/s2/s2_test.go

@@ -17,7 +17,7 @@ package s2
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
+	"io"
 	"net"
 	"testing"
 
@@ -54,7 +54,7 @@ func TestRegisteredCompression(t *testing.T) {
 
 	r, err := comp.Decompress(buf)
 	require.NoError(t, err)
-	expected, err := ioutil.ReadAll(r)
+	expected, err := io.ReadAll(r)
 	require.NoError(t, err)
 
 	assert.Equal(t, message, string(expected))

internal/snappy/snappy.go

@@ -24,7 +24,6 @@ package snappy
 
 import (
 	"io"
-	"io/ioutil"
 	"sync"
 
 	snappylib "github.com/golang/snappy"
@@ -55,7 +54,7 @@ func PretendInit(clobbering bool) {
 
 	c := &compressor{}
 	c.poolCompressor.New = func() interface{} {
-		w := snappylib.NewBufferedWriter(ioutil.Discard)
+		w := snappylib.NewBufferedWriter(io.Discard)
 		return &writer{Writer: w, pool: &c.poolCompressor}
 	}
 	encoding.RegisterCompressor(c)

internal/snappy/snappy_test.go

@@ -21,7 +21,7 @@ package snappy
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
+	"io"
 	"net"
 	"testing"
 
@@ -58,7 +58,7 @@ func TestRegisteredCompression(t *testing.T) {
 
 	r, err := comp.Decompress(buf)
 	require.NoError(t, err)
-	expected, err := ioutil.ReadAll(r)
+	expected, err := io.ReadAll(r)
 	require.NoError(t, err)
 
 	assert.Equal(t, message, string(expected))

internal/zstd/zstd_test.go

@@ -21,7 +21,7 @@ package zstd
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
+	"io"
 	"net"
 	"testing"
 
@@ -63,7 +63,7 @@ func TestRegisteredCompression(t *testing.T) {
 
 		r, err := comp.Decompress(buf)
 		require.NoError(t, err)
-		expected, err := ioutil.ReadAll(r)
+		expected, err := io.ReadAll(r)
 		require.NoError(t, err)
 
 		assert.Equal(t, message, string(expected))