From 840b3808d8241f36ae5091a473b9decb115c7ae8 Mon Sep 17 00:00:00 2001 From: cui fliter Date: Thu, 15 Sep 2022 08:07:49 +0000 Subject: [PATCH] all: replace io/ioutil with io and os package For #45557 Change-Id: Icd0ff87bf46592e89cd4c88754cf07c3b0c300e6 GitHub-Last-Rev: f13b442112124c856513f1e5b6de17aa706787fe GitHub-Pull-Request: golang/exp#43 Reviewed-on: https://go-review.googlesource.com/c/exp/+/430795 Run-TryBot: Jenny Rakoczy Reviewed-by: Jenny Rakoczy TryBot-Result: Gopher Robot Run-TryBot: Ian Lance Taylor Run-TryBot: Ian Lance Taylor Reviewed-by: Meng Zhuo Reviewed-by: Ian Lance Taylor Run-TryBot: Meng Zhuo Auto-Submit: Jenny Rakoczy --- apidiff/apidiff_test.go | 5 ++-- cmd/gorelease/gorelease.go | 33 +++++++++++++------------- cmd/gorelease/gorelease_test.go | 15 ++++++------ cmd/gorelease/proxy_test.go | 15 ++++++------ cmd/macos-roots-test/root_darwin.go | 3 +-- cmd/txtar/txtar.go | 10 ++++---- cmd/txtar/txtar_test.go | 7 +++--- ebnflint/ebnflint.go | 3 +-- event/adapter/stdlib/bench_test.go | 3 +-- event/alloc_test.go | 4 ++-- mmap/mmap_test.go | 6 ++--- shiny/driver/internal/x11key/gen.go | 3 +-- shiny/iconvg/decode_test.go | 11 ++++----- shiny/iconvg/encode_test.go | 6 ++--- shiny/iconvg/example_test.go | 3 +-- shiny/iconvg/upgrade_test.go | 4 ++-- shiny/materialdesign/colornames/gen.go | 3 +-- shiny/materialdesign/icons/gen.go | 7 +++--- shiny/text/text_test.go | 3 +-- shootout/k-nucleotide-parallel.go | 4 ++-- shootout/k-nucleotide.go | 4 ++-- shootout/regex-dna-parallel.go | 4 ++-- shootout/regex-dna.go | 4 ++-- sumdb/gosumcheck/main.go | 5 ++-- sumdb/internal/tlog/ct_test.go | 4 ++-- 25 files changed, 77 insertions(+), 92 deletions(-) diff --git a/apidiff/apidiff_test.go b/apidiff/apidiff_test.go index 9d55e14eb..a13009d41 100644 --- a/apidiff/apidiff_test.go +++ b/apidiff/apidiff_test.go @@ -4,7 +4,6 @@ import ( "bufio" "fmt" "go/types" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -18,7 +17,7 @@ import ( ) func TestChanges(t *testing.T) { - dir, err := ioutil.TempDir("", "apidiff_test") + dir, err := os.MkdirTemp("", "apidiff_test") if err != nil { t.Fatal(err) } @@ -63,7 +62,7 @@ func splitIntoPackages(t *testing.T, dir string) (incompatibles, compatibles []s if err := os.MkdirAll(filepath.Join(dir, "src", "apidiff"), 0700); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(filepath.Join(dir, "src", "apidiff", "go.mod"), []byte("module apidiff\n"), 0666); err != nil { + if err := os.WriteFile(filepath.Join(dir, "src", "apidiff", "go.mod"), []byte("module apidiff\n"), 0666); err != nil { t.Fatal(err) } diff --git a/cmd/gorelease/gorelease.go b/cmd/gorelease/gorelease.go index b0ee1e9ca..5c2342e7c 100644 --- a/cmd/gorelease/gorelease.go +++ b/cmd/gorelease/gorelease.go @@ -88,7 +88,6 @@ import ( "fmt" "go/build" "io" - "io/ioutil" "log" "os" "os/exec" @@ -166,7 +165,7 @@ func runRelease(ctx context.Context, w io.Writer, dir string, args []string) (su // test without printing to stderr. fs := flag.NewFlagSet("gorelease", flag.ContinueOnError) fs.Usage = func() {} - fs.SetOutput(ioutil.Discard) + fs.SetOutput(io.Discard) var baseOpt, releaseVersion string fs.StringVar(&baseOpt, "base", "", "previous version to compare against") fs.StringVar(&releaseVersion, "version", "", "proposed version to be released") @@ -309,7 +308,7 @@ func loadLocalModule(ctx context.Context, modRoot, repoRoot, version string) (m m.diagnostics = append(m.diagnostics, fmt.Sprintf("Version %s is lower than most pseudo-versions. Consider releasing v0.1.0-0 instead.", version)) } - m.goModData, err = ioutil.ReadFile(m.goModPath) + m.goModData, err = os.ReadFile(m.goModPath) if err != nil { return moduleInfo{}, err } @@ -371,7 +370,7 @@ func loadLocalModule(ctx context.Context, modRoot, repoRoot, version string) (m // Modules with major version suffixes can be defined in two places // (e.g., sub/go.mod and sub/v2/go.mod). They must not be defined in both. if altGoModPath != "" { - if data, err := ioutil.ReadFile(altGoModPath); err == nil { + if data, err := os.ReadFile(altGoModPath); err == nil { if altModPath := modfile.ModulePath(data); m.modPath == altModPath { goModRel, _ := filepath.Rel(repoRoot, m.goModPath) altGoModRel, _ := filepath.Rel(repoRoot, altGoModPath) @@ -511,7 +510,7 @@ func loadDownloadedModule(ctx context.Context, modPath, version, max string) (m if m.modRoot, m.goModPath, err = downloadModule(ctx, v); err != nil { return moduleInfo{}, err } - if m.goModData, err = ioutil.ReadFile(m.goModPath); err != nil { + if m.goModData, err = os.ReadFile(m.goModPath); err != nil { return moduleInfo{}, err } if m.goModFile, err = modfile.ParseLax(m.goModPath, m.goModData, nil); err != nil { @@ -774,7 +773,7 @@ func queryVersion(ctx context.Context, modPath, query string) (resolved string, return "", errors.New("query is based on requirements in main go.mod file") } - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") if err != nil { return "", err } @@ -805,7 +804,7 @@ func loadVersions(ctx context.Context, modPath string) (versions []string, err e } }() - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") if err != nil { return nil, err } @@ -882,7 +881,7 @@ func copyModuleToTempDir(repoRoot, modPath, modRoot string) (dir string, err err } m := module.Version{Path: modPath, Version: version} - zipFile, err := ioutil.TempFile("", "gorelease-*.zip") + zipFile, err := os.CreateTemp("", "gorelease-*.zip") if err != nil { return "", err } @@ -891,7 +890,7 @@ func copyModuleToTempDir(repoRoot, modPath, modRoot string) (dir string, err err os.Remove(zipFile.Name()) }() - dir, err = ioutil.TempDir("", "gorelease") + dir, err = os.MkdirTemp("", "gorelease") if err != nil { return "", err } @@ -980,7 +979,7 @@ func downloadModule(ctx context.Context, m module.Version) (modRoot, goModPath s // TODO(golang.org/issue/36812): 'go mod download' reads go.mod even though // we don't need information about the main module or the build list. // If it didn't read go.mod in this case, we wouldn't need a temp directory. - tmpDir, err := ioutil.TempDir("", "gorelease-download") + tmpDir, err := os.MkdirTemp("", "gorelease-download") if err != nil { return "", "", err } @@ -1073,7 +1072,7 @@ func prepareLoadDir(ctx context.Context, modFile *modfile.File, modPath, modRoot } } - dir, err = ioutil.TempDir("", "gorelease-load") + dir, err = os.MkdirTemp("", "gorelease-load") if err != nil { return "", nil, nil, nil, nil, err } @@ -1096,15 +1095,15 @@ func prepareLoadDir(ctx context.Context, modFile *modfile.File, modPath, modRoot if err != nil { return "", nil, nil, nil, nil, err } - if err := ioutil.WriteFile(filepath.Join(dir, "go.mod"), goModData, 0666); err != nil { + if err := os.WriteFile(filepath.Join(dir, "go.mod"), goModData, 0666); err != nil { return "", nil, nil, nil, nil, err } - goSumData, err = ioutil.ReadFile(filepath.Join(modRoot, "go.sum")) + goSumData, err = os.ReadFile(filepath.Join(modRoot, "go.sum")) if err != nil && !os.IsNotExist(err) { return "", nil, nil, nil, nil, err } - if err := ioutil.WriteFile(filepath.Join(dir, "go.sum"), goSumData, 0666); err != nil { + if err := os.WriteFile(filepath.Join(dir, "go.sum"), goSumData, 0666); err != nil { return "", nil, nil, nil, nil, err } @@ -1119,7 +1118,7 @@ func prepareLoadDir(ctx context.Context, modFile *modfile.File, modPath, modRoot for _, imp := range imps { fmt.Fprintf(fakeImports, "import _ %q\n", imp) } - if err := ioutil.WriteFile(filepath.Join(dir, "tmp.go"), []byte(fakeImports.String()), 0666); err != nil { + if err := os.WriteFile(filepath.Join(dir, "tmp.go"), []byte(fakeImports.String()), 0666); err != nil { return "", nil, nil, nil, nil, err } @@ -1148,7 +1147,7 @@ func prepareLoadDir(ctx context.Context, modFile *modfile.File, modPath, modRoot if err != nil { return "", nil, nil, nil, nil, err } - newGoModData, err := ioutil.ReadFile(goModPath) + newGoModData, err := os.ReadFile(goModPath) if err != nil { return "", nil, nil, nil, nil, err } @@ -1187,7 +1186,7 @@ func prepareLoadDir(ctx context.Context, modFile *modfile.File, modPath, modRoot if !cached { // Check if 'go get' added new hashes to go.sum. goSumPath := filepath.Join(dir, "go.sum") - newGoSumData, err := ioutil.ReadFile(goSumPath) + newGoSumData, err := os.ReadFile(goSumPath) if err != nil { if !os.IsNotExist(err) { return "", nil, nil, nil, nil, err diff --git a/cmd/gorelease/gorelease_test.go b/cmd/gorelease/gorelease_test.go index 216c747e9..47d08923e 100644 --- a/cmd/gorelease/gorelease_test.go +++ b/cmd/gorelease/gorelease_test.go @@ -9,7 +9,6 @@ import ( "context" "flag" "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -61,7 +60,7 @@ func prepareProxy(proxyVersions map[module.Version]bool, tests []*test) (ctx con } env = append(env, fmt.Sprintf("GOPROXY=%s", proxyURL)) - cacheDir, err := ioutil.TempDir("", "gorelease_test-gocache") + cacheDir, err := os.MkdirTemp("", "gorelease_test-gocache") if err != nil { return nil, nil, err } @@ -267,7 +266,7 @@ func updateTest(t *test, want []byte) error { wantFile.Data = want data := txtar.Format(&t.Archive) - return ioutil.WriteFile(t.testPath, data, 0666) + return os.WriteFile(t.testPath, data, 0666) } func TestRelease(t *testing.T) { @@ -303,7 +302,7 @@ func TestRelease(t *testing.T) { func TestRelease_gitRepo_uncommittedChanges(t *testing.T) { ctx := context.Background() buf := &bytes.Buffer{} - releaseDir, err := ioutil.TempDir("", "") + releaseDir, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -314,7 +313,7 @@ func TestRelease_gitRepo_uncommittedChanges(t *testing.T) { // Create an uncommitted change. bContents := `package b const B = "b"` - if err := ioutil.WriteFile(filepath.Join(releaseDir, "b.go"), []byte(bContents), 0644); err != nil { + if err := os.WriteFile(filepath.Join(releaseDir, "b.go"), []byte(bContents), 0644); err != nil { t.Fatal(err) } @@ -347,7 +346,7 @@ func testRelease(ctx context.Context, tests []*test, test *test) func(t *testing // Extract the files in the release version. They may be part of the // test archive or in testdata/mod. - testDir, err := ioutil.TempDir("", "") + testDir, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -447,7 +446,7 @@ func hgInit(t *testing.T, dir string) { t.Fatal(err) } - if err := ioutil.WriteFile(filepath.Join(dir, ".hg", "branch"), []byte("default"), 0777); err != nil { + if err := os.WriteFile(filepath.Join(dir, ".hg", "branch"), []byte("default"), 0777); err != nil { t.Fatal(err) } } @@ -488,7 +487,7 @@ func goModInit(t *testing.T, dir string) { aContents := `package a const A = "a"` - if err := ioutil.WriteFile(filepath.Join(dir, "a.go"), []byte(aContents), 0644); err != nil { + if err := os.WriteFile(filepath.Join(dir, "a.go"), []byte(aContents), 0644); err != nil { t.Fatal(err) } diff --git a/cmd/gorelease/proxy_test.go b/cmd/gorelease/proxy_test.go index d91d98337..d5fefd935 100644 --- a/cmd/gorelease/proxy_test.go +++ b/cmd/gorelease/proxy_test.go @@ -8,7 +8,6 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "os" "path/filepath" "sort" @@ -30,7 +29,7 @@ import ( // versions is non-empty, only those modules in mod/ that match an entry in // proxyVersions will be included. func buildProxyDir(proxyVersions map[module.Version]bool, tests []*test) (proxyDir, proxyURL string, err error) { - proxyDir, err = ioutil.TempDir("", "gorelease-proxy") + proxyDir, err = os.MkdirTemp("", "gorelease-proxy") if err != nil { return "", "", err } @@ -101,7 +100,7 @@ func buildProxyDir(proxyVersions map[module.Version]bool, tests []*test) (proxyD haveMod = true } outPath := filepath.Join(modDir, version+af.Name) - if err := ioutil.WriteFile(outPath, af.Data, 0666); err != nil { + if err := os.WriteFile(outPath, af.Data, 0666); err != nil { return "", "", err } continue @@ -119,13 +118,13 @@ func buildProxyDir(proxyVersions map[module.Version]bool, tests []*test) (proxyD if !haveInfo { outPath := filepath.Join(modDir, version+".info") outContent := fmt.Sprintf(`{"Version":"%s"}`, version) - if err := ioutil.WriteFile(outPath, []byte(outContent), 0666); err != nil { + if err := os.WriteFile(outPath, []byte(outContent), 0666); err != nil { return "", "", err } } if !haveMod && goMod.Name != "" { outPath := filepath.Join(modDir, version+".mod") - if err := ioutil.WriteFile(outPath, goMod.Data, 0666); err != nil { + if err := os.WriteFile(outPath, goMod.Data, 0666); err != nil { return "", "", err } } @@ -155,7 +154,7 @@ func buildProxyDir(proxyVersions map[module.Version]bool, tests []*test) (proxyD for _, v := range versions { fmt.Fprintln(buf, v) } - if err := ioutil.WriteFile(outPath, buf.Bytes(), 0666); err != nil { + if err := os.WriteFile(outPath, buf.Bytes(), 0666); err != nil { return "", "", err } buf.Reset() @@ -179,7 +178,7 @@ type txtarFile struct { func (f txtarFile) Path() string { return f.f.Name } func (f txtarFile) Lstat() (os.FileInfo, error) { return txtarFileInfo{f.f}, nil } func (f txtarFile) Open() (io.ReadCloser, error) { - return ioutil.NopCloser(bytes.NewReader(f.f.Data)), nil + return io.NopCloser(bytes.NewReader(f.f.Data)), nil } type txtarFileInfo struct { @@ -199,7 +198,7 @@ func extractTxtar(destDir string, arc *txtar.Archive) error { if err := os.MkdirAll(filepath.Dir(outPath), 0777); err != nil { return err } - if err := ioutil.WriteFile(outPath, f.Data, 0666); err != nil { + if err := os.WriteFile(outPath, f.Data, 0666); err != nil { return err } } diff --git a/cmd/macos-roots-test/root_darwin.go b/cmd/macos-roots-test/root_darwin.go index b5bf0f777..46f8c39fe 100644 --- a/cmd/macos-roots-test/root_darwin.go +++ b/cmd/macos-roots-test/root_darwin.go @@ -9,7 +9,6 @@ import ( "crypto/x509" "encoding/pem" "fmt" - "io/ioutil" "os" "os/exec" "os/user" @@ -142,7 +141,7 @@ func verifyCertWithSystem(cert *x509.Certificate) bool { Type: "CERTIFICATE", Bytes: cert.Raw, }) - f, err := ioutil.TempFile("", "cert") + f, err := os.CreateTemp("", "cert") if err != nil { fmt.Fprintf(os.Stderr, "can't create temporary file for cert: %v", err) return false diff --git a/cmd/txtar/txtar.go b/cmd/txtar/txtar.go index 9beb163d6..85219e51c 100644 --- a/cmd/txtar/txtar.go +++ b/cmd/txtar/txtar.go @@ -34,7 +34,7 @@ import ( "bytes" "flag" "fmt" - "io/ioutil" + "io" "os" "path" "path/filepath" @@ -79,7 +79,7 @@ func main() { } func extract() (err error) { - b, err := ioutil.ReadAll(os.Stdin) + b, err := io.ReadAll(os.Stdin) if err != nil { return err } @@ -114,7 +114,7 @@ func extract() (err error) { if err := os.MkdirAll(filepath.Dir(fileName), 0777); err != nil { return err } - if err := ioutil.WriteFile(fileName, f.Data, 0666); err != nil { + if err := os.WriteFile(fileName, f.Data, 0666); err != nil { return err } } @@ -143,7 +143,7 @@ func archive(paths []string) (err error) { } name := filepath.ToSlash(filepath.Join(p, suffix)) - data, err := ioutil.ReadFile(fileName) + data, err := os.ReadFile(fileName) if err != nil { return err } @@ -172,7 +172,7 @@ func archive(paths []string) (err error) { timer := time.AfterFunc(200*time.Millisecond, func() { fmt.Fprintln(os.Stderr, "Enter comment:") }) - comment, err := ioutil.ReadAll(os.Stdin) + comment, err := io.ReadAll(os.Stdin) timer.Stop() if err != nil { return fmt.Errorf("reading comment from %s: %v", os.Stdin.Name(), err) diff --git a/cmd/txtar/txtar_test.go b/cmd/txtar/txtar_test.go index ea9f2bfa7..224224007 100644 --- a/cmd/txtar/txtar_test.go +++ b/cmd/txtar/txtar_test.go @@ -6,7 +6,6 @@ package main_test import ( "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -41,7 +40,7 @@ func TestRoundTrip(t *testing.T) { defer os.Unsetenv("SPECIAL_LOCATION") // Expand the testdata archive into a temporary directory. - parentDir, err := ioutil.TempDir("", "txtar") + parentDir, err := os.MkdirTemp("", "txtar") if err != nil { t.Fatal(err) } @@ -68,7 +67,7 @@ func TestRoundTrip(t *testing.T) { func TestUnsafePaths(t *testing.T) { // Set up temporary directories for test archives. - parentDir, err := ioutil.TempDir("", "txtar") + parentDir, err := os.MkdirTemp("", "txtar") if err != nil { t.Fatal(err) } @@ -153,7 +152,7 @@ func txtarName(t *testing.T) string { } txtarBin.once.Do(func() { - exe, err := ioutil.TempFile("", "txtar-*.exe") + exe, err := os.CreateTemp("", "txtar-*.exe") if err != nil { txtarBin.err = err return diff --git a/ebnflint/ebnflint.go b/ebnflint/ebnflint.go index bf8ad5455..966dadf4f 100644 --- a/ebnflint/ebnflint.go +++ b/ebnflint/ebnflint.go @@ -11,7 +11,6 @@ import ( "go/scanner" "go/token" "io" - "io/ioutil" "os" "path/filepath" @@ -105,7 +104,7 @@ func verify(name, start string, r io.Reader) error { r = f } - src, err := ioutil.ReadAll(r) + src, err := io.ReadAll(r) if err != nil { return err } diff --git a/event/adapter/stdlib/bench_test.go b/event/adapter/stdlib/bench_test.go index 35cdd298b..da5ddd129 100644 --- a/event/adapter/stdlib/bench_test.go +++ b/event/adapter/stdlib/bench_test.go @@ -8,7 +8,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "log" "testing" @@ -94,7 +93,7 @@ func stdlibWriter(w io.Writer) context.Context { } func BenchmarkStdlibLogfDiscard(b *testing.B) { - eventtest.RunBenchmark(b, stdlibLogger(ioutil.Discard), stdlibLog) + eventtest.RunBenchmark(b, stdlibLogger(io.Discard), stdlibLog) } func BenchmarkStdlibPrintfDiscard(b *testing.B) { diff --git a/event/alloc_test.go b/event/alloc_test.go index 5144645a5..533ef9c4d 100644 --- a/event/alloc_test.go +++ b/event/alloc_test.go @@ -9,7 +9,7 @@ package event_test import ( "context" - "io/ioutil" + "io" "testing" "golang.org/x/exp/event" @@ -21,7 +21,7 @@ func TestAllocs(t *testing.T) { anInt := event.Int64("int", 4) aString := event.String("string", "value") - e := event.NewExporter(logfmt.NewHandler(ioutil.Discard), &event.ExporterOptions{EnableNamespaces: true}) + e := event.NewExporter(logfmt.NewHandler(io.Discard), &event.ExporterOptions{EnableNamespaces: true}) ctx := event.WithExporter(context.Background(), e) allocs := int(testing.AllocsPerRun(5, func() { event.Log(ctx, "message", aString, anInt) diff --git a/mmap/mmap_test.go b/mmap/mmap_test.go index 797fc5fc8..0716cc4e1 100644 --- a/mmap/mmap_test.go +++ b/mmap/mmap_test.go @@ -7,7 +7,7 @@ package mmap import ( "bytes" "io" - "io/ioutil" + "os" "testing" ) @@ -21,9 +21,9 @@ func TestOpen(t *testing.T) { if _, err := r.ReadAt(got, 0); err != nil && err != io.EOF { t.Fatalf("ReadAt: %v", err) } - want, err := ioutil.ReadFile(filename) + want, err := os.ReadFile(filename) if err != nil { - t.Fatalf("ioutil.ReadFile: %v", err) + t.Fatalf("os.ReadFile: %v", err) } if len(got) != len(want) { t.Fatalf("got %d bytes, want %d", len(got), len(want)) diff --git a/shiny/driver/internal/x11key/gen.go b/shiny/driver/internal/x11key/gen.go index 4af06603d..3ce4f1edb 100644 --- a/shiny/driver/internal/x11key/gen.go +++ b/shiny/driver/internal/x11key/gen.go @@ -13,7 +13,6 @@ import ( "bytes" "fmt" "go/format" - "io/ioutil" "log" "os" "regexp" @@ -68,7 +67,7 @@ var keysymCodePoints = map[rune]rune{ log.Fatalf("formatting output: %v", err) } - err = ioutil.WriteFile("table.go", fmted, 0644) + err = os.WriteFile("table.go", fmted, 0644) if err != nil { log.Fatalf("writing table.go: %v", err) } diff --git a/shiny/iconvg/decode_test.go b/shiny/iconvg/decode_test.go index 82356f0f1..33b0b7de7 100644 --- a/shiny/iconvg/decode_test.go +++ b/shiny/iconvg/decode_test.go @@ -11,7 +11,6 @@ import ( "image/color" "image/draw" "image/png" - "io/ioutil" "os" "path/filepath" "runtime" @@ -147,7 +146,7 @@ var testdataTestCases = []struct { func TestDisassembly(t *testing.T) { for _, tc := range testdataTestCases { - ivgData, err := ioutil.ReadFile(filepath.FromSlash(tc.filename) + ".ivg") + ivgData, err := os.ReadFile(filepath.FromSlash(tc.filename) + ".ivg") if err != nil { t.Errorf("%s: ReadFile: %v", tc.filename, err) continue @@ -159,12 +158,12 @@ func TestDisassembly(t *testing.T) { } wantFilename := filepath.FromSlash(tc.filename) + ".ivg.disassembly" if *updateFlag { - if err := ioutil.WriteFile(filepath.FromSlash(wantFilename), got, 0666); err != nil { + if err := os.WriteFile(filepath.FromSlash(wantFilename), got, 0666); err != nil { t.Errorf("%s: WriteFile: %v", tc.filename, err) } continue } - want, err := ioutil.ReadFile(wantFilename) + want, err := os.ReadFile(wantFilename) if err != nil { t.Errorf("%s: ReadFile: %v", tc.filename, err) continue @@ -180,7 +179,7 @@ func TestDisassembly(t *testing.T) { // so check that we get the original bytes after a decode + encode round-trip. func TestDecodeEncodeRoundTrip(t *testing.T) { for _, tc := range testdataTestCases { - ivgData, err := ioutil.ReadFile(filepath.FromSlash(tc.filename) + ".ivg") + ivgData, err := os.ReadFile(filepath.FromSlash(tc.filename) + ".ivg") if err != nil { t.Errorf("%s: ReadFile: %v", tc.filename, err) continue @@ -226,7 +225,7 @@ func (e *resolutionPreservingEncoder) Reset(m Metadata) { func TestDecodeAndRasterize(t *testing.T) { for _, tc := range testdataTestCases { - ivgData, err := ioutil.ReadFile(filepath.FromSlash(tc.filename) + ".ivg") + ivgData, err := os.ReadFile(filepath.FromSlash(tc.filename) + ".ivg") if err != nil { t.Errorf("%s: ReadFile: %v", tc.filename, err) continue diff --git a/shiny/iconvg/encode_test.go b/shiny/iconvg/encode_test.go index 0f41f52ca..57aa45139 100644 --- a/shiny/iconvg/encode_test.go +++ b/shiny/iconvg/encode_test.go @@ -8,8 +8,8 @@ import ( "bytes" "flag" "image/color" - "io/ioutil" "math" + "os" "path/filepath" "runtime" "strconv" @@ -28,12 +28,12 @@ func testEncode(t *testing.T, e *Encoder, wantFilename string) { t.Fatalf("encoding: %v", err) } if *updateFlag { - if err := ioutil.WriteFile(filepath.FromSlash(wantFilename), got, 0666); err != nil { + if err := os.WriteFile(filepath.FromSlash(wantFilename), got, 0666); err != nil { t.Fatalf("WriteFile: %v", err) } return } - want, err := ioutil.ReadFile(filepath.FromSlash(wantFilename)) + want, err := os.ReadFile(filepath.FromSlash(wantFilename)) if err != nil { t.Fatalf("ReadFile: %v", err) } diff --git a/shiny/iconvg/example_test.go b/shiny/iconvg/example_test.go index 879a1d0f8..7796625d5 100644 --- a/shiny/iconvg/example_test.go +++ b/shiny/iconvg/example_test.go @@ -7,7 +7,6 @@ package iconvg_test import ( "image" "image/draw" - "io/ioutil" "log" "os" "path/filepath" @@ -16,7 +15,7 @@ import ( ) func Example() { - ivgData, err := ioutil.ReadFile(filepath.FromSlash("testdata/action-info.lores.ivg")) + ivgData, err := os.ReadFile(filepath.FromSlash("testdata/action-info.lores.ivg")) if err != nil { log.Fatal(err) } diff --git a/shiny/iconvg/upgrade_test.go b/shiny/iconvg/upgrade_test.go index 00a196843..0b4b17557 100644 --- a/shiny/iconvg/upgrade_test.go +++ b/shiny/iconvg/upgrade_test.go @@ -5,14 +5,14 @@ package iconvg import ( - "io/ioutil" + "os" "path/filepath" "testing" ) func TestUpgradeToFileFormatVersion1(t *testing.T) { for _, tc := range testdataTestCases { - original, err := ioutil.ReadFile(filepath.FromSlash(tc.filename) + ".ivg") + original, err := os.ReadFile(filepath.FromSlash(tc.filename) + ".ivg") if err != nil { t.Errorf("%s: ReadFile: %v", tc.filename, err) continue diff --git a/shiny/materialdesign/colornames/gen.go b/shiny/materialdesign/colornames/gen.go index 3969d8be8..f663952dd 100644 --- a/shiny/materialdesign/colornames/gen.go +++ b/shiny/materialdesign/colornames/gen.go @@ -15,7 +15,6 @@ import ( "go/format" "image/color" "io" - "io/ioutil" "log" "net/http" "strings" @@ -174,7 +173,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/shiny/materialdesign/icons/gen.go b/shiny/materialdesign/icons/gen.go index 473d2a79b..2e95bfc8e 100644 --- a/shiny/materialdesign/icons/gen.go +++ b/shiny/materialdesign/icons/gen.go @@ -15,7 +15,6 @@ import ( "fmt" "go/format" "io" - "io/ioutil" "log" "os" "path" @@ -169,7 +168,7 @@ func main() { if err != nil { log.Fatalf("gofmt failed: %v\n\nGenerated code:\n%s", err, raw) } - if err := ioutil.WriteFile("data.go", formatted, 0644); err != nil { + if err := os.WriteFile("data.go", formatted, 0644); err != nil { log.Fatalf("WriteFile failed: %s\n", err) } @@ -187,7 +186,7 @@ func main() { if err != nil { log.Fatalf("gofmt failed: %v\n\nGenerated code:\n%s", err, raw) } - if err := ioutil.WriteFile("data_test.go", formatted, 0644); err != nil { + if err := os.WriteFile("data_test.go", formatted, 0644); err != nil { log.Fatalf("WriteFile failed: %s\n", err) } } @@ -329,7 +328,7 @@ var skippedFiles = map[[2]string]bool{ func genFile(fqSVGDirName, dirName, baseName, fileName string, size float32) error { fqFileName := filepath.Join(fqSVGDirName, fileName) - svgData, err := ioutil.ReadFile(fqFileName) + svgData, err := os.ReadFile(fqFileName) if err != nil { return err } diff --git a/shiny/text/text_test.go b/shiny/text/text_test.go index a2eedb9ba..7c93212c8 100644 --- a/shiny/text/text_test.go +++ b/shiny/text/text_test.go @@ -9,7 +9,6 @@ import ( "fmt" "image" "io" - "io/ioutil" "math/rand" "reflect" "sort" @@ -207,7 +206,7 @@ func TestSeek(t *testing.T) { func testRead(f *Frame, want string) error { c := f.NewCaret() defer c.Close() - asBytes, err := ioutil.ReadAll(c) + asBytes, err := io.ReadAll(c) if err != nil { return fmt.Errorf("ReadAll: %v", err) } diff --git a/shootout/k-nucleotide-parallel.go b/shootout/k-nucleotide-parallel.go index 8b2541903..75e2c8f6c 100644 --- a/shootout/k-nucleotide-parallel.go +++ b/shootout/k-nucleotide-parallel.go @@ -42,7 +42,7 @@ import ( "bufio" "bytes" "fmt" - "io/ioutil" + "io" "os" "runtime" "sort" @@ -114,7 +114,7 @@ func main() { break } } - data, err := ioutil.ReadAll(in) + data, err := io.ReadAll(in) if err != nil { fmt.Fprintln(os.Stderr, "ReadAll err:", err) os.Exit(2) diff --git a/shootout/k-nucleotide.go b/shootout/k-nucleotide.go index efc8d95ec..6fc535da1 100644 --- a/shootout/k-nucleotide.go +++ b/shootout/k-nucleotide.go @@ -42,7 +42,7 @@ import ( "bufio" "bytes" "fmt" - "io/ioutil" + "io" "os" "sort" ) @@ -115,7 +115,7 @@ func main() { break } } - data, err := ioutil.ReadAll(in) + data, err := io.ReadAll(in) if err != nil { fmt.Fprintln(os.Stderr, "ReadAll err:", err) os.Exit(2) diff --git a/shootout/regex-dna-parallel.go b/shootout/regex-dna-parallel.go index 68ccd7601..49bb5591a 100644 --- a/shootout/regex-dna-parallel.go +++ b/shootout/regex-dna-parallel.go @@ -40,7 +40,7 @@ package main import ( "fmt" - "io/ioutil" + "io" "os" "regexp" "runtime" @@ -92,7 +92,7 @@ func countMatches(pat string, bytes []byte) int { func main() { runtime.GOMAXPROCS(4) - bytes, err := ioutil.ReadAll(os.Stdin) + bytes, err := io.ReadAll(os.Stdin) if err != nil { fmt.Fprintf(os.Stderr, "can't read input: %s\n", err) os.Exit(2) diff --git a/shootout/regex-dna.go b/shootout/regex-dna.go index 85e1939cc..2f441373c 100644 --- a/shootout/regex-dna.go +++ b/shootout/regex-dna.go @@ -40,7 +40,7 @@ package main import ( "fmt" - "io/ioutil" + "io" "os" "regexp" ) @@ -90,7 +90,7 @@ func countMatches(pat string, bytes []byte) int { } func main() { - bytes, err := ioutil.ReadAll(os.Stdin) + bytes, err := io.ReadAll(os.Stdin) if err != nil { fmt.Fprintf(os.Stderr, "can't read input: %s\n", err) os.Exit(2) diff --git a/sumdb/gosumcheck/main.go b/sumdb/gosumcheck/main.go index cd7aef221..ddd7400a0 100644 --- a/sumdb/gosumcheck/main.go +++ b/sumdb/gosumcheck/main.go @@ -34,7 +34,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "net/http" "os" @@ -84,7 +83,7 @@ func main() { conn.SetGONOSUMDB(env) for _, arg := range flag.Args() { - data, err := ioutil.ReadFile(arg) + data, err := os.ReadFile(arg) if err != nil { log.Fatal(err) } @@ -201,7 +200,7 @@ func (*client) ReadRemote(path string) ([]byte, error) { if resp.StatusCode != 200 { return nil, fmt.Errorf("GET %v: %v", target, resp.Status) } - data, err := ioutil.ReadAll(io.LimitReader(resp.Body, 1<<20)) + data, err := io.ReadAll(io.LimitReader(resp.Body, 1<<20)) if err != nil { return nil, err } diff --git a/sumdb/internal/tlog/ct_test.go b/sumdb/internal/tlog/ct_test.go index c2d9aebe7..f8c364b9a 100644 --- a/sumdb/internal/tlog/ct_test.go +++ b/sumdb/internal/tlog/ct_test.go @@ -7,7 +7,7 @@ package tlog import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "os" @@ -80,7 +80,7 @@ func httpGET(t *testing.T, url string, targ interface{}) { t.Fatal(err) } defer resp.Body.Close() - data, err := ioutil.ReadAll(resp.Body) + data, err := io.ReadAll(resp.Body) if err != nil { t.Fatal(err) }