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
}