all: replace io/ioutil with io and os package

racequite · racequite · commit 9dbc74ce2a12 · 2022-09-23T19:22:25.000+08:00
Signed-off-by: queryfast &lt;quiterace@gmail.com&gt;
diff --git a/bmp/writer_test.go b/bmp/writer_test.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"image"
 	"image/draw"
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 	"time"
@@ -138,6 +138,6 @@ func BenchmarkEncode(b *testing.B) {
 	b.SetBytes(int64(s.X * s.Y * 4))
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		Encode(ioutil.Discard, img)
+		Encode(io.Discard, img)
 	}
 }
diff --git a/ccitt/gen.go b/ccitt/gen.go
@@ -12,7 +12,6 @@ import (
 	"flag"
 	"fmt"
 	"go/format"
-	"io/ioutil"
 	"log"
 	"os"
 )
@@ -264,15 +263,15 @@ func finish(w *bytes.Buffer, filename string) {
 	if err != nil {
 		log.Fatalf("format.Source: %v", err)
 	}
-	if err := ioutil.WriteFile(filename, out, 0660); err != nil {
-		log.Fatalf("ioutil.WriteFile: %v", err)
+	if err := os.WriteFile(filename, out, 0660); err != nil {
+		log.Fatalf("os.WriteFile: %v", err)
 	}
 }
 
 func copyPaste(w *bytes.Buffer, filename string) {
-	b, err := ioutil.ReadFile("gen.go")
+	b, err := os.ReadFile("gen.go")
 	if err != nil {
-		log.Fatalf("ioutil.ReadFile: %v", err)
+		log.Fatalf("os.ReadFile: %v", err)
 	}
 	begin := []byte("\n// COPY PASTE " + filename + " BEGIN\n\n")
 	end := []byte("\n// COPY PASTE " + filename + " END\n\n")
diff --git a/ccitt/reader_test.go b/ccitt/reader_test.go
@@ -10,7 +10,6 @@ import (
 	"image"
 	"image/png"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"path/filepath"
@@ -301,7 +300,7 @@ func testRead(t *testing.T, fileName string, sf SubFormat, align, invert, trunca
 			t.Fatalf("Open: %v", err)
 		}
 		defer f.Close()
-		gotBytes, err := ioutil.ReadAll(NewReader(f, MSB, sf, width, height, opts))
+		gotBytes, err := io.ReadAll(NewReader(f, MSB, sf, width, height, opts))
 		if err != nil {
 			t.Fatalf("ReadAll: %v", err)
 		}
@@ -382,7 +381,7 @@ func testRead(t *testing.T, fileName string, sf SubFormat, align, invert, trunca
 			t.Fatalf("Open: %v", err)
 		}
 		defer f.Close()
-		adhBytes, err := ioutil.ReadAll(NewReader(f, MSB, sf, width, AutoDetectHeight, opts))
+		adhBytes, err := io.ReadAll(NewReader(f, MSB, sf, width, AutoDetectHeight, opts))
 		if err != nil {
 			t.Fatalf("ReadAll: %v", err)
 		}
diff --git a/colornames/gen.go b/colornames/gen.go
@@ -15,9 +15,9 @@ import (
 	"go/format"
 	"image/color"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
+	"os"
 	"regexp"
 	"sort"
 	"strconv"
@@ -192,7 +192,7 @@ func main() {
 		log.Fatalf("Error while formatting code: %s\n", err)
 	}
 
-	if err := ioutil.WriteFile("table.go", fmted, 0644); err != nil {
+	if err := os.WriteFile("table.go", fmted, 0644); err != nil {
 		log.Fatalf("Error writing table.go: %s\n", err)
 	}
 }
diff --git a/draw/gen.go b/draw/gen.go
@@ -12,7 +12,6 @@ import (
 	"flag"
 	"fmt"
 	"go/format"
-	"io/ioutil"
 	"log"
 	"os"
 	"strings"
@@ -45,7 +44,7 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	if err := ioutil.WriteFile("impl.go", out, 0660); err != nil {
+	if err := os.WriteFile("impl.go", out, 0660); err != nil {
 		log.Fatal(err)
 	}
 }
diff --git a/example/font/main.go b/example/font/main.go
@@ -18,7 +18,6 @@ import (
 	"image/color"
 	"image/draw"
 	"image/png"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -52,19 +51,19 @@ func main() {
 	}
 	var face font.Face
 	if strings.HasSuffix(*fontFlag, ".font") {
-		fontData, err := ioutil.ReadFile(*fontFlag)
+		fontData, err := os.ReadFile(*fontFlag)
 		if err != nil {
 			log.Fatal(err)
 		}
 		dir := filepath.Dir(*fontFlag)
 		face, err = plan9font.ParseFont(fontData, func(name string) ([]byte, error) {
-			return ioutil.ReadFile(filepath.Join(dir, filepath.FromSlash(name)))
+			return os.ReadFile(filepath.Join(dir, filepath.FromSlash(name)))
 		})
 		if err != nil {
 			log.Fatal(err)
 		}
 	} else {
-		fontData, err := ioutil.ReadFile(*fontFlag)
+		fontData, err := os.ReadFile(*fontFlag)
 		if err != nil {
 			log.Fatal(err)
 		}
diff --git a/font/basicfont/gen.go b/font/basicfont/gen.go
@@ -14,8 +14,8 @@ import (
 	"go/format"
 	"image"
 	"image/draw"
-	"io/ioutil"
 	"log"
+	"os"
 	"path"
 	"path/filepath"
 
@@ -34,7 +34,7 @@ func main() {
 	const width, height, ascent = 7 - 1, 13, 11
 
 	readFile := func(name string) ([]byte, error) {
-		return ioutil.ReadFile(filepath.FromSlash(path.Join("../testdata/fixed", name)))
+		return os.ReadFile(filepath.FromSlash(path.Join("../testdata/fixed", name)))
 	}
 	fontData, err := readFile("unicode.7x13.font")
 	if err != nil {
@@ -98,8 +98,8 @@ func main() {
 	if err != nil {
 		log.Fatalf("format.Source: %v", err)
 	}
-	if err := ioutil.WriteFile("data.go", fmted, 0644); err != nil {
-		log.Fatalf("ioutil.WriteFile: %v", err)
+	if err := os.WriteFile("data.go", fmted, 0644); err != nil {
+		log.Fatalf("os.WriteFile: %v", err)
 	}
 }
 
diff --git a/font/gofont/gen.go b/font/gofont/gen.go
@@ -21,7 +21,6 @@ import (
 	"bytes"
 	"fmt"
 	"go/format"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -56,7 +55,7 @@ func do(ttfName string) {
 	if err := os.Mkdir(pkgName, 0777); err != nil && !os.IsExist(err) {
 		log.Fatal(err)
 	}
-	src, err := ioutil.ReadFile(filepath.Join("ttfs", ttfName))
+	src, err := os.ReadFile(filepath.Join("ttfs", ttfName))
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -87,7 +86,7 @@ func do(ttfName string) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(pkgName, "data.go"), dst, 0666); err != nil {
+	if err := os.WriteFile(filepath.Join(pkgName, "data.go"), dst, 0666); err != nil {
 		log.Fatal(err)
 	}
 }
diff --git a/font/plan9font/example_test.go b/font/plan9font/example_test.go
@@ -7,7 +7,6 @@ package plan9font_test
 import (
 	"image"
 	"image/draw"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -20,7 +19,7 @@ import (
 
 func ExampleParseFont() {
 	readFile := func(name string) ([]byte, error) {
-		return ioutil.ReadFile(filepath.FromSlash(path.Join("../testdata/fixed", name)))
+		return os.ReadFile(filepath.FromSlash(path.Join("../testdata/fixed", name)))
 	}
 	fontData, err := readFile("unicode.7x13.font")
 	if err != nil {
diff --git a/font/plan9font/plan9font.go b/font/plan9font/plan9font.go
@@ -247,7 +247,7 @@ func (f *face) subface(r rune) (*subface, rune) {
 
 // ParseFont parses a Plan 9 font file. data is the contents of that font file,
 // which gives relative filenames for subfont files. readFile returns the
-// contents of those subfont files. It is similar to io/ioutil's ReadFile
+// contents of those subfont files. It is similar to os's ReadFile
 // function, except that it takes a relative filename instead of an absolute
 // one.
 func ParseFont(data []byte, readFile func(relFilename string) ([]byte, error)) (font.Face, error) {
diff --git a/font/plan9font/plan9font_test.go b/font/plan9font/plan9font_test.go
@@ -6,7 +6,7 @@ package plan9font
 
 import (
 	"image"
-	"io/ioutil"
+	"os"
 	"path"
 	"path/filepath"
 	"testing"
@@ -16,7 +16,7 @@ import (
 
 func TestMetrics(t *testing.T) {
 	readFile := func(name string) ([]byte, error) {
-		return ioutil.ReadFile(filepath.FromSlash(path.Join("../testdata/fixed", name)))
+		return os.ReadFile(filepath.FromSlash(path.Join("../testdata/fixed", name)))
 	}
 	data, err := readFile("unicode.7x13.font")
 	if err != nil {
@@ -45,7 +45,7 @@ func TestMetrics(t *testing.T) {
 }
 
 func BenchmarkParseSubfont(b *testing.B) {
-	subfontData, err := ioutil.ReadFile(filepath.FromSlash("../testdata/fixed/7x13.0000"))
+	subfontData, err := os.ReadFile(filepath.FromSlash("../testdata/fixed/7x13.0000"))
 	if err != nil {
 		b.Fatal(err)
 	}
diff --git a/font/sfnt/gen.go b/font/sfnt/gen.go
@@ -11,7 +11,6 @@ import (
 	"bytes"
 	"fmt"
 	"go/format"
-	"io/ioutil"
 	"log"
 )
 
@@ -53,8 +52,8 @@ func main() {
 	if err != nil {
 		log.Fatalf("format.Source: %v\n\n----\n%s\n----", err, dstUnformatted)
 	}
-	if err := ioutil.WriteFile("data.go", dst, 0666); err != nil {
-		log.Fatalf("ioutil.WriteFile: %v", err)
+	if err := os.WriteFile("data.go", dst, 0666); err != nil {
+		log.Fatalf("os.WriteFile: %v", err)
 	}
 }
 
diff --git a/font/sfnt/kern_test.go b/font/sfnt/kern_test.go
@@ -24,7 +24,6 @@ go test golang.org/x/image/font/sfnt -test.run=BulkKern -args -bulk -bulkFontDir
 
 import (
 	"flag"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -78,7 +77,7 @@ func TestBulkKern(t *testing.T) {
 func testFontKerning(fname string) func(*testing.T) {
 	return func(t *testing.T) {
 		t.Parallel()
-		b, err := ioutil.ReadFile(fname)
+		b, err := os.ReadFile(fname)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/font/sfnt/proprietary_test.go b/font/sfnt/proprietary_test.go
@@ -36,7 +36,7 @@ go test golang.org/x/image/font/sfnt -test.run=ProprietaryMicrosoft -args -propr
 import (
 	"errors"
 	"flag"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -250,7 +250,7 @@ func testProprietary(t *testing.T, proprietor, filename string, minNumGlyphs, fi
 	default:
 		panic("unreachable")
 	}
-	file, err := ioutil.ReadFile(filepath.Join(dir, basename))
+	file, err := os.ReadFile(filepath.Join(dir, basename))
 	if err != nil {
 		t.Fatalf("%v\nPerhaps you need to set the -%sDir flag?", err, proprietor)
 	}
diff --git a/font/sfnt/sfnt.go b/font/sfnt/sfnt.go
@@ -209,7 +209,7 @@ func u32(b []byte) uint32 {
 // source is a source of byte data. Conceptually, it is like an io.ReaderAt,
 // except that a common source of SFNT font data is in-memory instead of
 // on-disk: a []byte containing the entire data, either as a global variable
-// (e.g. "goregular.TTF") or the result of an ioutil.ReadFile call. In such
+// (e.g. "goregular.TTF") or the result of an os.ReadFile call. In such
 // cases, as an optimization, we skip the io.Reader / io.ReaderAt model of
 // copying from the source to a caller-supplied buffer, and instead provide
 // direct access to the underlying []byte data.
diff --git a/font/sfnt/sfnt_test.go b/font/sfnt/sfnt_test.go
@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"fmt"
 	"image"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -233,7 +233,7 @@ func TestBounds(t *testing.T) {
 }
 
 func TestMetrics(t *testing.T) {
-	cmapFont, err := ioutil.ReadFile(filepath.FromSlash("../testdata/cmapTest.ttf"))
+	cmapFont, err := os.ReadFile(filepath.FromSlash("../testdata/cmapTest.ttf"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -467,7 +467,7 @@ func TestGoRegularGlyphIndex(t *testing.T) {
 }
 
 func TestGlyphIndex(t *testing.T) {
-	data, err := ioutil.ReadFile(filepath.FromSlash("../testdata/cmapTest.ttf"))
+	data, err := os.ReadFile(filepath.FromSlash("../testdata/cmapTest.ttf"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -778,7 +778,7 @@ func TestTrueTypeSegments(t *testing.T) {
 }
 
 func testSegments(t *testing.T, filename string, wants [][]Segment) {
-	data, err := ioutil.ReadFile(filepath.FromSlash("../testdata/" + filename))
+	data, err := os.ReadFile(filepath.FromSlash("../testdata/" + filename))
 	if err != nil {
 		t.Fatalf("ReadFile: %v", err)
 	}
@@ -816,7 +816,7 @@ func testSegments(t *testing.T, filename string, wants [][]Segment) {
 }
 
 func TestPPEM(t *testing.T) {
-	data, err := ioutil.ReadFile(filepath.FromSlash("../testdata/glyfTest.ttf"))
+	data, err := os.ReadFile(filepath.FromSlash("../testdata/glyfTest.ttf"))
 	if err != nil {
 		t.Fatalf("ReadFile: %v", err)
 	}
@@ -870,7 +870,7 @@ func TestPPEM(t *testing.T) {
 }
 
 func TestPostInfo(t *testing.T) {
-	data, err := ioutil.ReadFile(filepath.FromSlash("../testdata/glyfTest.ttf"))
+	data, err := os.ReadFile(filepath.FromSlash("../testdata/glyfTest.ttf"))
 	if err != nil {
 		t.Fatalf("ReadFile: %v", err)
 	}
diff --git a/riff/example_test.go b/riff/example_test.go
@@ -7,7 +7,6 @@ package riff_test
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"strings"
 
@@ -60,7 +59,7 @@ func dump(r *riff.Reader, indent string) error {
 			}
 			continue
 		}
-		b, err := ioutil.ReadAll(chunkData)
+		b, err := io.ReadAll(chunkData)
 		if err != nil {
 			return err
 		}
diff --git a/riff/riff.go b/riff/riff.go
@@ -16,7 +16,6 @@ package riff // import "golang.org/x/image/riff"
 import (
 	"errors"
 	"io"
-	"io/ioutil"
 	"math"
 )
 
@@ -103,7 +102,7 @@ func (z *Reader) Next() (chunkID FourCC, chunkLen uint32, chunkData io.Reader, e
 	if z.chunkLen != 0 {
 		want := z.chunkLen
 		var got int64
-		got, z.err = io.Copy(ioutil.Discard, z.chunkReader)
+		got, z.err = io.Copy(io.Discard, z.chunkReader)
 		if z.err == nil && uint32(got) != want {
 			z.err = errShortChunkData
 		}
diff --git a/tiff/reader.go b/tiff/reader.go
diff --git a/tiff/reader_test.go b/tiff/reader_test.go
diff --git a/tiff/writer_test.go b/tiff/writer_test.go
diff --git a/vector/gen.go b/vector/gen.go
diff --git a/webp/decode_test.go b/webp/decode_test.go

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ import (`
`12`	`12`	`"flag"`
`13`	`13`	`"fmt"`
`14`	`14`	`"go/format"`
`15`		`- "io/ioutil"`
`16`	`15`	`"log"`
`17`	`16`	`"os"`
`18`	`17`	`)`
`@@ -264,15 +263,15 @@ func finish(w *bytes.Buffer, filename string) {`
`264`	`263`	`if err != nil {`
`265`	`264`	`log.Fatalf("format.Source: %v", err)`
`266`	`265`	`}`
`267`		`- if err := ioutil.WriteFile(filename, out, 0660); err != nil {`
`268`		`- log.Fatalf("ioutil.WriteFile: %v", err)`
	`266`	`+ if err := os.WriteFile(filename, out, 0660); err != nil {`
	`267`	`+ log.Fatalf("os.WriteFile: %v", err)`
`269`	`268`	`}`
`270`	`269`	`}`
`271`	`270`
`272`	`271`	`func copyPaste(w *bytes.Buffer, filename string) {`
`273`		`- b, err := ioutil.ReadFile("gen.go")`
	`272`	`+ b, err := os.ReadFile("gen.go")`
`274`	`273`	`if err != nil {`
`275`		`- log.Fatalf("ioutil.ReadFile: %v", err)`
	`274`	`+ log.Fatalf("os.ReadFile: %v", err)`
`276`	`275`	`}`
`277`	`276`	`begin := []byte("\n// COPY PASTE " + filename + " BEGIN\n\n")`
`278`	`277`	`end := []byte("\n// COPY PASTE " + filename + " END\n\n")`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`"image"`
`11`	`11`	`"image/png"`
`12`	`12`	`"io"`
`13`		`- "io/ioutil"`
`14`	`13`	`"math/rand"`
`15`	`14`	`"os"`
`16`	`15`	`"path/filepath"`
`@@ -301,7 +300,7 @@ func testRead(t *testing.T, fileName string, sf SubFormat, align, invert, trunca`
`301`	`300`	`t.Fatalf("Open: %v", err)`
`302`	`301`	`}`
`303`	`302`	`defer f.Close()`
`304`		`- gotBytes, err := ioutil.ReadAll(NewReader(f, MSB, sf, width, height, opts))`
	`303`	`+ gotBytes, err := io.ReadAll(NewReader(f, MSB, sf, width, height, opts))`
`305`	`304`	`if err != nil {`
`306`	`305`	`t.Fatalf("ReadAll: %v", err)`
`307`	`306`	`}`
`@@ -382,7 +381,7 @@ func testRead(t *testing.T, fileName string, sf SubFormat, align, invert, trunca`
`382`	`381`	`t.Fatalf("Open: %v", err)`
`383`	`382`	`}`
`384`	`383`	`defer f.Close()`
`385`		`- adhBytes, err := ioutil.ReadAll(NewReader(f, MSB, sf, width, AutoDetectHeight, opts))`
	`384`	`+ adhBytes, err := io.ReadAll(NewReader(f, MSB, sf, width, AutoDetectHeight, opts))`
`386`	`385`	`if err != nil {`
`387`	`386`	`t.Fatalf("ReadAll: %v", err)`
`388`	`387`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ import (`
`15`	`15`	`"go/format"`
`16`	`16`	`"image/color"`
`17`	`17`	`"io"`
`18`		`- "io/ioutil"`
`19`	`18`	`"log"`
`20`	`19`	`"net/http"`
	`20`	`+ "os"`
`21`	`21`	`"regexp"`
`22`	`22`	`"sort"`
`23`	`23`	`"strconv"`
`@@ -192,7 +192,7 @@ func main() {`
`192`	`192`	`log.Fatalf("Error while formatting code: %s\n", err)`
`193`	`193`	`}`
`194`	`194`
`195`		`- if err := ioutil.WriteFile("table.go", fmted, 0644); err != nil {`
	`195`	`+ if err := os.WriteFile("table.go", fmted, 0644); err != nil {`
`196`	`196`	`log.Fatalf("Error writing table.go: %s\n", err)`
`197`	`197`	`}`
`198`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import (`
`21`	`21`	`"bytes"`
`22`	`22`	`"fmt"`
`23`	`23`	`"go/format"`
`24`		`- "io/ioutil"`
`25`	`24`	`"log"`
`26`	`25`	`"os"`
`27`	`26`	`"path/filepath"`
`@@ -56,7 +55,7 @@ func do(ttfName string) {`
`56`	`55`	`if err := os.Mkdir(pkgName, 0777); err != nil && !os.IsExist(err) {`
`57`	`56`	`log.Fatal(err)`
`58`	`57`	`}`
`59`		`- src, err := ioutil.ReadFile(filepath.Join("ttfs", ttfName))`
	`58`	`+ src, err := os.ReadFile(filepath.Join("ttfs", ttfName))`
`60`	`59`	`if err != nil {`
`61`	`60`	`log.Fatal(err)`
`62`	`61`	`}`
`@@ -87,7 +86,7 @@ func do(ttfName string) {`
`87`	`86`	`if err != nil {`
`88`	`87`	`log.Fatal(err)`
`89`	`88`	`}`
`90`		`- if err := ioutil.WriteFile(filepath.Join(pkgName, "data.go"), dst, 0666); err != nil {`
	`89`	`+ if err := os.WriteFile(filepath.Join(pkgName, "data.go"), dst, 0666); err != nil {`
`91`	`90`	`log.Fatal(err)`
`92`	`91`	`}`
`93`	`92`	`}`