Remove calls to Go's deprecated "io/ioutil"

This commit is contained in:
Nigel Tao committed 2021-08-22 11:17:34 +10:00
1 parent 788479dd64
commit 226c476994
31 files changed
+73 -93

No files matched your search

+1 -2
View File
@@ -25,7 +25,6 @@ import (
"flag"
"fmt"
"io"
"io/ioutil"
"net/http"
"os"
"sort"
@@ -152,7 +151,7 @@ func main1() error {
fmt.Fprintf(w, "// %4d entries have %2d%s probes\n", x, i, plus)
}
return ioutil.WriteFile("data.go", w.Bytes(), 0644)
return os.WriteFile("data.go", w.Bytes(), 0644)
}
func build() error {
+2 -2
View File
@@ -16,7 +16,7 @@ package cgolz4
import (
"bytes"
"io/ioutil"
"io"
"strings"
"testing"
)
@@ -74,7 +74,7 @@ func TestRoundTrip(tt *testing.T) {
// Uncompress.
{
r.Reset(strings.NewReader(compressed), nil)
gotBytes, err := ioutil.ReadAll(r)
gotBytes, err := io.ReadAll(r)
if err != nil {
r.Close()
tt.Fatalf("i=%d: ReadAll: %v", i, err)
+4 -4
View File
@@ -18,7 +18,7 @@ import (
"bytes"
"compress/zlib"
"io"
"io/ioutil"
"os"
"strings"
"testing"
)
@@ -57,7 +57,7 @@ func testReadAll(tt *testing.T, r resetReadCloser, src io.Reader, dict []byte, w
tt.Fatalf("Reset: %v", err)
}
got, err := ioutil.ReadAll(r)
got, err := io.ReadAll(r)
if err != nil {
tt.Fatalf("ReadAll: %v", err)
}
@@ -87,7 +87,7 @@ func benchmarkReader(b *testing.B, r resetReadCloser) {
}
src := bytes.NewReader(nil)
srcBytes, err := ioutil.ReadFile("../../test/data/pi.txt.zlib")
srcBytes, err := os.ReadFile("../../test/data/pi.txt.zlib")
if err != nil {
b.Fatalf("ReadFile: %v", err)
}
@@ -100,7 +100,7 @@ func benchmarkReader(b *testing.B, r resetReadCloser) {
b.Fatalf("Reset: %v", err)
}
if n, err := io.Copy(ioutil.Discard, r); err != nil {
if n, err := io.Copy(io.Discard, r); err != nil {
b.Fatalf("Copy: %v", err)
} else if n != 100003 {
b.Fatalf("Copy: got %d, want %d", n, 100003)
+3 -3
View File
@@ -16,7 +16,7 @@ package cgozstd
import (
"bytes"
"io/ioutil"
"io"
"strings"
"testing"
)
@@ -87,7 +87,7 @@ func TestRoundTrip(tt *testing.T) {
r.Close()
tt.Fatalf("i=%d: Reset: %v", i, err)
}
gotBytes, err := ioutil.ReadAll(r)
gotBytes, err := io.ReadAll(r)
if err != nil {
r.Close()
tt.Fatalf("i=%d: ReadAll: %v", i, err)
@@ -149,7 +149,7 @@ func TestDictionary(tt *testing.T) {
r.Close()
tt.Fatalf("%s: Reset: %v", name, err)
}
gotBytes, err := ioutil.ReadAll(r)
gotBytes, err := io.ReadAll(r)
if err != nil {
r.Close()
tt.Fatalf("%s: ReadAll: %v", name, err)
+1 -2
View File
@@ -18,7 +18,6 @@ import (
"bytes"
"compress/flate"
"io"
"io/ioutil"
"testing"
"github.com/google/wuffs/internal/testcut"
@@ -43,7 +42,7 @@ func newReader(r io.Reader) (io.ReadCloser, error) {
}
func decodeFlate(src []byte) string {
dst, err := ioutil.ReadAll(flate.NewReader(bytes.NewReader(src)))
dst, err := io.ReadAll(flate.NewReader(bytes.NewReader(src)))
if err != nil {
return err.Error()
}
+3 -4
View File
@@ -20,7 +20,6 @@ import (
"fmt"
"hash/crc32"
"io"
"io/ioutil"
"math/rand"
"os"
"strings"
@@ -165,7 +164,7 @@ func TestWriterILAStartMemTempFile(tt *testing.T) {
}
func TestWriterILAStartRealTempFile(tt *testing.T) {
f, err := ioutil.TempFile("", "rac_test")
f, err := os.CreateTemp("", "rac_test")
if err != nil {
tt.Fatalf("TempFile: %v", err)
}
@@ -560,7 +559,7 @@ func TestReaderEmpty(tt *testing.T) {
CompressedSize: int64(len(encoded)),
}
defer r.Close()
got, err := ioutil.ReadAll(r)
got, err := io.ReadAll(r)
if err != nil {
tt.Fatalf("ReadAll: %v", err)
}
@@ -587,7 +586,7 @@ func TestReaderZeroes(tt *testing.T) {
CompressedSize: int64(len(encoded)),
}
defer r.Close()
got, err := ioutil.ReadAll(r)
got, err := io.ReadAll(r)
if err != nil {
tt.Fatalf("ReadAll: %v", err)
}
+2 -2
View File
@@ -18,7 +18,7 @@ import (
"bytes"
"compress/zlib"
"fmt"
"io/ioutil"
"io"
"log"
"strings"
@@ -83,7 +83,7 @@ func ExampleCut() {
if err != nil {
log.Fatalf("NewReader: %v", err)
}
uncompressed, err := ioutil.ReadAll(r)
uncompressed, err := io.ReadAll(r)
if err != nil {
log.Fatalf("ReadAll: %v", err)
}