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

+3 -4
View File
@@ -61,7 +61,6 @@ import (
"flag"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"runtime"
@@ -146,9 +145,9 @@ func walk(filename string, info os.FileInfo, err error) error {
func do(r io.Reader, filename string) error {
src, err := []byte(nil), error(nil)
if r != nil {
src, err = ioutil.ReadAll(r)
src, err = io.ReadAll(r)
} else {
src, err = ioutil.ReadFile(filename)
src, err = os.ReadFile(filename)
}
if err != nil {
return err
@@ -180,7 +179,7 @@ func do(r io.Reader, filename string) error {
const chmodSupported = runtime.GOOS != "windows"
func writeFile(filename string, b []byte) error {
f, err := ioutil.TempFile(filepath.Dir(filename), filepath.Base(filename))
f, err := os.CreateTemp(filepath.Dir(filename), filepath.Base(filename))
if err != nil {
return err
}
+2 -3
View File
@@ -25,7 +25,6 @@ import (
"bytes"
"fmt"
"go/format"
"io/ioutil"
"os"
)
@@ -37,7 +36,7 @@ func main() {
}
func main1() error {
src, err := ioutil.ReadFile("main.go")
src, err := os.ReadFile("main.go")
if err != nil {
return err
}
@@ -81,5 +80,5 @@ const usageStr = ` + "`")
if err != nil {
return err
}
return ioutil.WriteFile("data.go", formatted, 0644)
return os.WriteFile("data.go", formatted, 0644)
}
+3 -4
View File
@@ -251,7 +251,6 @@ import (
"flag"
"fmt"
"io"
"io/ioutil"
"os"
"runtime"
"strconv"
@@ -415,7 +414,7 @@ func decode(inFile *os.File) error {
// This seek-to-end error isn't fatal. The input might not actually be
// seekable, despite being an *os.File: "cat foo | ractool -decode".
// Instead, read all of the inFile into memory.
if inBytes, err := ioutil.ReadAll(inFile); err != nil {
if inBytes, err := io.ReadAll(inFile); err != nil {
return err
} else {
rs = bytes.NewReader(inBytes)
@@ -532,7 +531,7 @@ func encode(r io.Reader) error {
if *resourcesFlag != "" {
for _, filename := range strings.Split(*resourcesFlag, ",") {
resource, err := ioutil.ReadFile(filename)
resource, err := os.ReadFile(filename)
if err != nil {
return err
}
@@ -590,7 +589,7 @@ func makeTempFile() (io.ReadWriter, error) {
return &bytes.Buffer{}, nil
}
f, err := ioutil.TempFile(*tmpdirFlag, "ractool-")
f, err := os.CreateTemp(*tmpdirFlag, "ractool-")
if err != nil {
return nil, err
}
+1 -2
View File
@@ -18,7 +18,6 @@ import (
"bytes"
"flag"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"sort"
@@ -83,7 +82,7 @@ func doGenrelease(args []string) error {
}
relFilename := filename[len(baseDirSlash):]
s, err := ioutil.ReadFile(filename)
s, err := os.ReadFile(filename)
if err != nil {
return err
}
+1 -2
View File
@@ -18,7 +18,6 @@ import (
"bufio"
"flag"
"fmt"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -83,7 +82,7 @@ func doBenchTest(args []string, bench bool) error {
func doBenchTest1(filename string, bench bool, ccompilers string, focus string,
iterscale int, mimic bool, reps int) (failed bool, err error) {
workDir, err := ioutil.TempDir("", "wuffs-c")
workDir, err := os.MkdirTemp("", "wuffs-c")
if err != nil {
return false, err
}
+2 -3
View File
@@ -21,7 +21,6 @@ import (
"bytes"
"flag"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"sort"
@@ -142,14 +141,14 @@ func appendDir(dstQF []string, qualDirname string, suffix string, returnSubdirs
}
func writeFile(filename string, contents []byte) error {
if existing, err := ioutil.ReadFile(filename); err == nil && bytes.Equal(existing, contents) {
if existing, err := os.ReadFile(filename); err == nil && bytes.Equal(existing, contents) {
fmt.Println("gen unchanged: ", filename)
return nil
}
if err := os.MkdirAll(filepath.Dir(filename), 0755); err != nil {
return err
}
if err := ioutil.WriteFile(filename, contents, 0644); err != nil {
if err := os.WriteFile(filename, contents, 0644); err != nil {
return err
}
fmt.Println("gen wrote: ", filename)
+3 -4
View File
@@ -29,7 +29,6 @@ import (
"flag"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"runtime"
@@ -113,9 +112,9 @@ func walk(filename string, info os.FileInfo, err error) error {
func do(r io.Reader, filename string) error {
src, err := []byte(nil), error(nil)
if r != nil {
src, err = ioutil.ReadAll(r)
src, err = io.ReadAll(r)
} else {
src, err = ioutil.ReadFile(filename)
src, err = os.ReadFile(filename)
}
if err != nil {
return err
@@ -160,7 +159,7 @@ func do(r io.Reader, filename string) error {
const chmodSupported = runtime.GOOS != "windows"
func writeFile(filename string, b []byte) error {
f, err := ioutil.TempFile(filepath.Dir(filename), filepath.Base(filename))
f, err := os.CreateTemp(filepath.Dir(filename), filepath.Base(filename))
if err != nil {
return err
}
+2 -3
View File
@@ -25,7 +25,6 @@ import (
"bytes"
"fmt"
"go/format"
"io/ioutil"
"os"
"strings"
)
@@ -68,7 +67,7 @@ func main1() error {
if err != nil {
return err
}
return ioutil.WriteFile("data.go", formatted, 0644)
return os.WriteFile("data.go", formatted, 0644)
}
func genData(out *bytes.Buffer) error {
@@ -114,7 +113,7 @@ func genData(out *bytes.Buffer) error {
copyright := []byte(nil)
for _, f := range files {
in, err := ioutil.ReadFile(f.filename)
in, err := os.ReadFile(f.filename)
if err != nil {
return err
}
+4 -4
View File
@@ -18,7 +18,7 @@ package testcut
import (
"bytes"
"io"
"io/ioutil"
"os"
"testing"
)
@@ -29,7 +29,7 @@ func calculateDecodedLen(b []byte,
if err != nil {
return 0, err
}
n, err := io.Copy(ioutil.Discard, r)
n, err := io.Copy(io.Discard, r)
if err != nil {
r.Close()
return 0, err
@@ -48,7 +48,7 @@ func Test(tt *testing.T,
filenames []string) {
for _, filename := range filenames {
full, err := ioutil.ReadFile("../../test/data/" + filename)
full, err := os.ReadFile("../../test/data/" + filename)
if err != nil {
tt.Errorf("f=%q: ReadFile: %v", filename, err)
continue
@@ -151,7 +151,7 @@ func Benchmark(b *testing.B,
trimSuffix int,
decodedLen int64) {
full, err := ioutil.ReadFile("../../test/data/" + filename)
full, err := os.ReadFile("../../test/data/" + filename)
if err != nil {
b.Fatalf("ReadFile: %v", err)
}
+1 -2
View File
@@ -25,7 +25,6 @@ import (
"bytes"
"fmt"
"go/format"
"io/ioutil"
"os"
"strings"
@@ -64,7 +63,7 @@ func main1() error {
if err != nil {
return err
}
return ioutil.WriteFile("data.go", formatted, 0644)
return os.WriteFile("data.go", formatted, 0644)
}
var (
+2 -3
View File
@@ -25,7 +25,6 @@ import (
"bytes"
"fmt"
"go/format"
"io/ioutil"
"os"
"sort"
"strings"
@@ -57,11 +56,11 @@ func main1() error {
if err != nil {
return err
}
return ioutil.WriteFile("data.go", formatted, 0644)
return os.WriteFile("data.go", formatted, 0644)
}
func loadReasons() ([]string, error) {
s, err := ioutil.ReadFile("axioms.md")
s, err := os.ReadFile("axioms.md")
if err != nil {
return nil, err
}
+4 -4
View File
@@ -17,7 +17,7 @@ package generate
import (
"flag"
"fmt"
"io/ioutil"
"io"
"os"
"path/filepath"
"strings"
@@ -98,7 +98,7 @@ func checkPackageName(s string) string {
func parseFiles(tm *t.Map, filenames []string) (files []*a.File, err error) {
if len(filenames) == 0 {
const filename = "stdin"
src, err := ioutil.ReadAll(os.Stdin)
src, err := io.ReadAll(os.Stdin)
if err != nil {
return nil, err
}
@@ -117,7 +117,7 @@ func parseFiles(tm *t.Map, filenames []string) (files []*a.File, err error) {
func ParseFiles(tm *t.Map, filenames []string, opts *parse.Options) (files []*a.File, err error) {
for _, filename := range filenames {
src, err := ioutil.ReadFile(filename)
src, err := os.ReadFile(filename)
if err != nil {
return nil, err
}
@@ -139,5 +139,5 @@ func resolveUse(usePath string) ([]byte, error) {
if err != nil {
return nil, err
}
return ioutil.ReadFile(filepath.Join(wuffsRoot, "gen", "wuffs", filepath.FromSlash(usePath)))
return os.ReadFile(filepath.Join(wuffsRoot, "gen", "wuffs", filepath.FromSlash(usePath)))
}
+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)
}
+2 -3
View File
@@ -30,7 +30,6 @@ import (
"compress/flate"
"fmt"
"io"
"io/ioutil"
"os"
"runtime"
"time"
@@ -63,7 +62,7 @@ var testCases = []testCase{{
}}
func mustLoad(filename string) []byte {
src, err := ioutil.ReadFile("../../" + filename)
src, err := os.ReadFile("../../" + filename)
if err != nil {
panic(err.Error())
}
@@ -118,6 +117,6 @@ func main1() error {
func decode(src []byte) (numBytes uint64, retErr error) {
r := flate.NewReader(bytes.NewReader(src))
defer r.Close()
n, err := io.Copy(ioutil.Discard, r)
n, err := io.Copy(io.Discard, r)
return uint64(n), err
}
+1 -2
View File
@@ -31,7 +31,6 @@ import (
"image"
"image/draw"
"image/gif"
"io/ioutil"
"os"
"runtime"
"strings"
@@ -88,7 +87,7 @@ var testCases = []testCase{{
}}
func mustLoad(filename string) []byte {
src, err := ioutil.ReadFile("../../" + filename)
src, err := os.ReadFile("../../" + filename)
if err != nil {
panic(err.Error())
}
+1 -2
View File
@@ -31,7 +31,6 @@ import (
"image"
"image/draw"
"image/png"
"io/ioutil"
"os"
"runtime"
"strings"
@@ -72,7 +71,7 @@ var testCases = []testCase{{
}}
func mustLoad(filename string) []byte {
src, err := ioutil.ReadFile("../../" + filename)
src, err := os.ReadFile("../../" + filename)
if err != nil {
panic(err.Error())
}
+3 -3
View File
@@ -34,7 +34,7 @@ import (
"crypto/sha256"
"flag"
"fmt"
"io/ioutil"
"io"
"log"
"math/rand"
"net/http"
@@ -485,7 +485,7 @@ func (w worker) work1(u *url.URL, followHTML bool) (e entry, links []*url.URL, f
if _, err := os.Stat(filename); os.IsNotExist(err) {
log.Printf("worker #%03d: writing %q", w, urlString)
os.MkdirAll(filepath.Dir(filename), 0755)
if err := ioutil.WriteFile(filename, data, 0644); err != nil {
if err := os.WriteFile(filename, data, 0644); err != nil {
log.Println(err)
return entry{}, nil, true
}
@@ -509,7 +509,7 @@ func fetch(urlString string) (statusCode uint32, body []byte, retErr error) {
}
defer res.Body.Close()
body, err = ioutil.ReadAll(res.Body)
body, err = io.ReadAll(res.Body)
if err != nil {
return 0, nil, err
}
+3 -3
View File
@@ -36,7 +36,7 @@ import (
"bytes"
"flag"
"fmt"
"io/ioutil"
"io"
"os"
)
@@ -113,7 +113,7 @@ func emit() error {
}
filename := fmt.Sprintf("cbor-rfc-7049-examples/%02d.cbor", fileNumber)
fileNumber++
err := ioutil.WriteFile(filename, contents, 0644)
err := os.WriteFile(filename, contents, 0644)
contents = nil
return err
}
@@ -129,7 +129,7 @@ func readExampleTable() ([]byte, error) {
appendixA := []byte("Appendix A. Examples\n\n")
ruler := []byte("+------------------------------+------------------------------------+\n")
src, err := ioutil.ReadAll(os.Stdin)
src, err := io.ReadAll(os.Stdin)
if err != nil {
return nil, err
}
+6 -6
View File
@@ -34,7 +34,7 @@ import (
"flag"
"fmt"
"hash/adler32"
"io/ioutil"
"io"
"os"
"strings"
)
@@ -72,7 +72,7 @@ func main1() error {
}
func decode(filename string) error {
src, err := ioutil.ReadFile(filename)
src, err := os.ReadFile(filename)
if err != nil {
return err
}
@@ -131,7 +131,7 @@ func doWriteDeflate(deflateCompressed []byte, uncompressed []byte, filename stri
filename = filename[:len(filename)-3]
}
filename += ".deflate"
if err := ioutil.WriteFile(filename, deflateCompressed, 0666); err != nil {
if err := os.WriteFile(filename, deflateCompressed, 0666); err != nil {
return err
}
fmt.Printf("wrote %s\n", filename)
@@ -171,7 +171,7 @@ func doWriteZlib(deflateCompressed []byte, uncompressed []byte, filename string)
filename = filename[:len(filename)-3]
}
filename += ".zlib"
if err := ioutil.WriteFile(filename, asZlib, 0666); err != nil {
if err := os.WriteFile(filename, asZlib, 0666); err != nil {
return err
}
fmt.Printf("wrote %s\n", filename)
@@ -193,7 +193,7 @@ func readString(src []byte, i int) (int, error) {
func checkDeflate(x []byte) ([]byte, error) {
rc := flate.NewReader(bytes.NewReader(x))
defer rc.Close()
x, err := ioutil.ReadAll(rc)
x, err := io.ReadAll(rc)
if err != nil {
return nil, fmt.Errorf("data is not valid deflate: %v", err)
}
@@ -206,7 +206,7 @@ func checkZlib(x []byte) ([]byte, error) {
return nil, fmt.Errorf("data is not valid zlib: %v", err)
}
defer rc.Close()
x, err = ioutil.ReadAll(rc)
x, err = io.ReadAll(rc)
if err != nil {
return nil, fmt.Errorf("data is not valid zlib: %v", err)
}
+4 -4
View File
@@ -37,7 +37,7 @@ import (
"compress/lzw"
"flag"
"fmt"
"io/ioutil"
"io"
"os"
"path/filepath"
)
@@ -91,7 +91,7 @@ func main1() error {
filename = fmt.Sprintf("%s-frame-%03d", filename, argIndex)
}
filename += ".indexes.giflzw"
if err := ioutil.WriteFile(filename, frame, 0644); err != nil {
if err := os.WriteFile(filename, frame, 0644); err != nil {
return err
}
}
@@ -117,7 +117,7 @@ func main1() error {
}
func extractLZWFrames(filename string) (ret [][]byte, err error) {
src, err := ioutil.ReadFile(filename)
src, err := os.ReadFile(filename)
if err != nil {
return nil, err
}
@@ -238,7 +238,7 @@ func checkLZW(data []byte) error {
}
rc := lzw.NewReader(bytes.NewReader(data[1:]), lzw.LSB, int(data[0]))
defer rc.Close()
_, err := ioutil.ReadAll(rc)
_, err := io.ReadAll(rc)
if err != nil {
return fmt.Errorf("block data is not valid LZW: %v", err)
}
+2 -3
View File
@@ -30,7 +30,6 @@ import (
"image"
"image/gif"
"image/png"
"io/ioutil"
"os"
"path/filepath"
)
@@ -61,12 +60,12 @@ func main1() error {
}
}
if bPalette != nil {
if err := ioutil.WriteFile(baseFilename+".palette", bPalette, 0644); err != nil {
if err := os.WriteFile(baseFilename+".palette", bPalette, 0644); err != nil {
return err
}
}
if bIndexes != nil {
if err := ioutil.WriteFile(baseFilename+".indexes", bIndexes, 0644); err != nil {
if err := os.WriteFile(baseFilename+".indexes", bIndexes, 0644); err != nil {
return err
}
}
+2 -2
View File
@@ -27,7 +27,7 @@ import (
"bytes"
"compress/lzw"
"fmt"
"io/ioutil"
"io"
"os"
"strconv"
"strings"
@@ -55,7 +55,7 @@ func main() {
}
func main1() error {
stdin, err := ioutil.ReadAll(os.Stdin)
stdin, err := io.ReadAll(os.Stdin)
if err != nil {
return err
}
+3 -4
View File
@@ -111,7 +111,6 @@ import (
"bytes"
"flag"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"runtime"
@@ -167,7 +166,7 @@ func main1() error {
sort.Strings(sortedFilenames)
for _, filename := range sortedFilenames {
contents := globalTargets[filename]
if x, err := ioutil.ReadFile(filename); (err == nil) && bytes.Equal(x, contents) {
if x, err := os.ReadFile(filename); (err == nil) && bytes.Equal(x, contents) {
fmt.Printf("gen unchanged: %s\n", filename)
continue
@@ -241,7 +240,7 @@ type filter struct {
}
func do(filename string) error {
src, err := ioutil.ReadFile(filename)
src, err := os.ReadFile(filename)
if err != nil {
return err
}
@@ -396,7 +395,7 @@ func wuffsfmt(src []byte) []byte {
const chmodSupported = runtime.GOOS != "windows"
func writeFile(filename string, b []byte) error {
f, err := ioutil.TempFile(filepath.Dir(filename), filepath.Base(filename))
f, err := os.CreateTemp(filepath.Dir(filename), filepath.Base(filename))
if err != nil {
return err
}
+1 -2
View File
@@ -38,7 +38,6 @@ import (
"flag"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"sort"
@@ -106,7 +105,7 @@ func main1() error {
}
func visit(r *renderer, filename string) error {
src, err := ioutil.ReadFile(filename)
src, err := os.ReadFile(filename)
if err != nil {
return err
}
+1 -2
View File
@@ -26,7 +26,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"math/rand"
"os"
@@ -42,7 +41,7 @@ func main() {
}
func main1() error {
input, err := ioutil.ReadAll(os.Stdin)
input, err := io.ReadAll(os.Stdin)
if err != nil {
return err
}