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

+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
}