[playground] all: replace io/ioutil with io and os package
35 views
Skip to first unread message
Gopher Robot (Gerrit)
Sep 13, 2022, 11:27:32 AM9/13/22
to shuang cui, Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Bryan Mills, Jenny Rakoczy, golang-co...@googlegroups.com
Gopher Robot submitted this change.
Approvals:
Ian Lance Taylor: Looks good to me, but someone else must approve
Bryan Mills: Looks good to me, approved; Run TryBots; Automatically submit change
Gopher Robot: TryBots succeeded
all: replace io/ioutil with io and os package
Change-Id: I84f4996a1eaae239a5152866aa34033847da38bc
GitHub-Last-Rev: 60cc9c27b5d8fa12ff52faed815518c89a5bdb0d
GitHub-Pull-Request: golang/playground#19
Reviewed-on: https://go-review.googlesource.com/c/playground/+/430595
Reviewed-by: Bryan Mills <bcm...@google.com>
Reviewed-by: Ian Lance Taylor <ia...@google.com>
Run-TryBot: Bryan Mills <bcm...@google.com>
TryBot-Result: Gopher Robot <go...@golang.org>
Auto-Submit: Bryan Mills <bcm...@google.com>
---
M client.go
M internal/gcpdial/gcpdial.go
M sandbox.go
M sandbox/sandbox.go
M server_test.go
M vet.go
6 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/client.go b/client.go
index dc7ead8..c49c121 100644
--- a/client.go
+++ b/client.go
@@ -9,13 +9,13 @@
import (
"encoding/json"
- "io/ioutil"
+ "io"
"log"
"os"
)
func main() {
- body, err := ioutil.ReadAll(os.Stdin)
+ body, err := io.ReadAll(os.Stdin)
if err != nil {
log.Fatalf("error reading stdin: %v", err)
}
diff --git a/internal/gcpdial/gcpdial.go b/internal/gcpdial/gcpdial.go
index 9fe3661..c9d4dce 100644
--- a/internal/gcpdial/gcpdial.go
+++ b/internal/gcpdial/gcpdial.go
@@ -10,7 +10,6 @@
"context"
"fmt"
"io"
- "io/ioutil"
"log"
"math/rand"
"net/http"
@@ -91,7 +90,7 @@
res, err := http.DefaultClient.Do(req)
if res != nil {
defer res.Body.Close()
- defer io.Copy(ioutil.Discard, res.Body)
+ defer io.Copy(io.Discard, res.Body)
}
healthy := err == nil && res.StatusCode == http.StatusOK
if healthy == p.healthy {
diff --git a/sandbox.go b/sandbox.go
index b7864be..47f3b06 100644
--- a/sandbox.go
+++ b/sandbox.go
@@ -19,7 +19,6 @@
"go/parser"
"go/token"
"io"
- "io/ioutil"
"net"
"net/http"
"os"
@@ -331,7 +330,7 @@
// *response.Errors contains an explanation for a user.
func compileAndRun(ctx context.Context, req *request) (*response, error) {
// TODO(andybons): Add semaphore to limit number of running programs at once.
- tmpDir, err := ioutil.TempDir("", "sandbox")
+ tmpDir, err := os.MkdirTemp("", "sandbox")
if err != nil {
return nil, fmt.Errorf("error creating temp directory: %v", err)
}
@@ -457,7 +456,7 @@
return nil, err
}
}
- if err := ioutil.WriteFile(in, src, 0644); err != nil {
+ if err := os.WriteFile(in, src, 0644); err != nil {
return nil, fmt.Errorf("error creating temp file %q: %v", in, err)
}
}
@@ -474,7 +473,7 @@
// into GOPATH/pkg/mod.
cmd.Args = append(cmd.Args, "-modcacherw")
cmd.Args = append(cmd.Args, "-mod=mod")
- br.goPath, err = ioutil.TempDir("", "gopath")
+ br.goPath, err = os.MkdirTemp("", "gopath")
if err != nil {
log.Printf("error creating temp directory: %v", err)
return nil, fmt.Errorf("error creating temp directory: %v", err)
@@ -537,7 +536,7 @@
stats.RecordWithTags(ctx, []tag.Mutator{tag.Upsert(kGoBuildSuccess, status)},
mGoRunLatency.M(float64(time.Since(start))/float64(time.Millisecond)))
}()
- exeBytes, err := ioutil.ReadFile(exePath)
+ exeBytes, err := os.ReadFile(exePath)
if err != nil {
return execRes, err
}
@@ -551,7 +550,7 @@
if testParam != "" {
sreq.Header.Add("X-Argument", testParam)
}
- sreq.GetBody = func() (io.ReadCloser, error) { return ioutil.NopCloser(bytes.NewReader(exeBytes)), nil }
+ sreq.GetBody = func() (io.ReadCloser, error) { return io.NopCloser(bytes.NewReader(exeBytes)), nil }
res, err := sandboxBackendClient().Do(sreq)
if err != nil {
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
@@ -586,7 +585,7 @@
// healthCheck attempts to build a binary from the source in healthProg.
// It returns any error returned from sandboxBuild, or nil if none is returned.
func (s *server) healthCheck(ctx context.Context) error {
- tmpDir, err := ioutil.TempDir("", "sandbox")
+ tmpDir, err := os.MkdirTemp("", "sandbox")
if err != nil {
return fmt.Errorf("error creating temp directory: %v", err)
}
diff --git a/sandbox/sandbox.go b/sandbox/sandbox.go
index f65e642..45fca98 100644
--- a/sandbox/sandbox.go
+++ b/sandbox/sandbox.go
@@ -20,7 +20,6 @@
"flag"
"fmt"
"io"
- "io/ioutil"
"log"
"net/http"
"os"
@@ -325,7 +324,7 @@
if _, err := io.WriteString(os.Stdout, containedStartMessage); err != nil {
log.Fatalf("writing to stdout: %v", err)
}
- slurp, err := ioutil.ReadAll(os.Stdin)
+ slurp, err := io.ReadAll(os.Stdin)
if err != nil {
log.Fatalf("reading stdin in contained mode: %v", err)
}
@@ -335,7 +334,7 @@
}
metaJSON, bin := slurp[:nl], slurp[nl+1:]
- if err := ioutil.WriteFile(binPath, bin, 0755); err != nil {
+ if err := os.WriteFile(binPath, bin, 0755); err != nil {
log.Fatalf("writing contained binary: %v", err)
}
defer os.Remove(binPath) // not that it matters much, this container will be nuked
@@ -553,7 +552,7 @@
}
defer func() { <-runSem }()
- bin, err := ioutil.ReadAll(http.MaxBytesReader(w, r.Body, maxBinarySize))
+ bin, err := io.ReadAll(http.MaxBytesReader(w, r.Body, maxBinarySize))
if err != nil {
log.Printf("failed to read request body: %v", err)
http.Error(w, err.Error(), http.StatusInternalServerError)
diff --git a/server_test.go b/server_test.go
index 10e8df2..b1a73a3 100644
--- a/server_test.go
+++ b/server_test.go
@@ -9,7 +9,7 @@
"context"
"encoding/json"
"fmt"
- "io/ioutil"
+ "io"
"net/http"
"net/http/httptest"
"os"
@@ -97,9 +97,9 @@
}
if tc.respBody != nil {
defer resp.Body.Close()
- b, err := ioutil.ReadAll(resp.Body)
+ b, err := io.ReadAll(resp.Body)
if err != nil {
- t.Errorf("%s: ioutil.ReadAll(resp.Body): %v", tc.desc, err)
+ t.Errorf("%s: io.ReadAll(resp.Body): %v", tc.desc, err)
}
if !bytes.Equal(b, tc.respBody) {
t.Errorf("%s: got unexpected body %q; want %q", tc.desc, b, tc.respBody)
@@ -152,9 +152,9 @@
}
if tc.respBody != nil {
defer resp.Body.Close()
- b, err := ioutil.ReadAll(resp.Body)
+ b, err := io.ReadAll(resp.Body)
if err != nil {
- t.Errorf("%s: ioutil.ReadAll(resp.Body): %v", tc.desc, err)
+ t.Errorf("%s: io.ReadAll(resp.Body): %v", tc.desc, err)
}
if !bytes.Contains(b, tc.respBody) {
t.Errorf("%s: got unexpected body %q; want contains %q", tc.desc, b, tc.respBody)
@@ -292,9 +292,9 @@
}
if tc.respBody != nil {
defer resp.Body.Close()
- b, err := ioutil.ReadAll(resp.Body)
+ b, err := io.ReadAll(resp.Body)
if err != nil {
- t.Errorf("%s: ioutil.ReadAll(resp.Body): %v", tc.desc, err)
+ t.Errorf("%s: io.ReadAll(resp.Body): %v", tc.desc, err)
}
if !bytes.Equal(b, tc.respBody) {
t.Errorf("%s: got unexpected body %q; want %q", tc.desc, b, tc.respBody)
diff --git a/vet.go b/vet.go
index 889c63e..ece62a7 100644
--- a/vet.go
+++ b/vet.go
@@ -7,7 +7,6 @@
import (
"context"
"fmt"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -27,14 +26,14 @@
// boolean set. This code path doesn't support modules and only exists
// as a temporary compatibility bridge to older javascript clients.
func vetCheck(ctx context.Context, req *request) (*response, error) {
- tmpDir, err := ioutil.TempDir("", "vet")
+ tmpDir, err := os.MkdirTemp("", "vet")
if err != nil {
return nil, fmt.Errorf("error creating temp directory: %v", err)
}
defer os.RemoveAll(tmpDir)
in := filepath.Join(tmpDir, progName)
- if err := ioutil.WriteFile(in, []byte(req.Body), 0400); err != nil {
+ if err := os.WriteFile(in, []byte(req.Body), 0400); err != nil {
return nil, fmt.Errorf("error creating temp file %q: %v", in, err)
}
vetOutput, err := vetCheckInDir(ctx, tmpDir, os.Getenv("GOPATH"))
To view, visit change 430595. To unsubscribe, or for help writing mail filters, visit settings.
Damien Neil (Gerrit)
Sep 14, 2022, 8:44:49 PM9/14/22
to shuang cui, Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Dmitri Shuralyov, Dmitri Shuralyov, Gopher Robot, golang-co...@googlegroups.com
Damien Neil submitted this change.
Approvals:
Dmitri Shuralyov: Looks good to me, but someone else must approve
Gopher Robot: TryBots succeeded
Damien Neil: Looks good to me, approved; Run TryBots
all: replace io/ioutil with io and os package
Change-Id: I3c6860d1758ac49b13fbb545e1e1957e345153ae
GitHub-Last-Rev: 9f43b2bf417cfdfe750b48cccd429cd1aded809c
GitHub-Pull-Request: golang/vulndb#997
Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/430855
TryBot-Result: Gopher Robot <go...@golang.org>
Reviewed-by: Dmitri Shuralyov <dmit...@google.com>
Reviewed-by: Damien Neil <dn...@google.com>
Run-TryBot: Damien Neil <dn...@google.com>
---
M all_test.go
M cmd/worker/main.go
M internal/database/generate.go
M internal/database/load.go
M internal/issues/issues_test.go
M internal/worker/gen_false_positives.go
6 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/all_test.go b/all_test.go
index 142512e..33bf037 100644
--- a/all_test.go
+++ b/all_test.go
@@ -9,7 +9,6 @@
import (
"errors"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -50,7 +49,7 @@
allFiles := make(map[string]string)
var reports []string
for _, dir := range []string{reportsDir, excludedDir} {
- files, err := ioutil.ReadDir(dir)
+ files, err := os.ReadDir(dir)
if err != nil && !errors.Is(err, os.ErrNotExist) {
t.Fatalf("unable to read %v/: %s", dir, err)
}
diff --git a/cmd/worker/main.go b/cmd/worker/main.go
index 40c8658..ec39ce2 100644
--- a/cmd/worker/main.go
+++ b/cmd/worker/main.go
@@ -14,7 +14,6 @@
"errors"
"flag"
"fmt"
- "io/ioutil"
"net/http"
"os"
"strings"
@@ -76,7 +75,7 @@
flag.Parse()
if *githubTokenFile != "" {
- data, err := ioutil.ReadFile(*githubTokenFile)
+ data, err := os.ReadFile(*githubTokenFile)
if err != nil {
die("%v", err)
}
diff --git a/internal/database/generate.go b/internal/database/generate.go
index 087a0f9..d8b350a 100644
--- a/internal/database/generate.go
+++ b/internal/database/generate.go
@@ -9,7 +9,6 @@
"context"
"encoding/json"
"fmt"
- "io/ioutil"
"os"
"path/filepath"
"sort"
@@ -97,7 +96,7 @@
return nil, nil, err
}
- yamlFiles, err := ioutil.ReadDir(filepath.Join(repoDir, yamlDir))
+ yamlFiles, err := os.ReadDir(filepath.Join(repoDir, yamlDir))
if err != nil {
return nil, nil, fmt.Errorf("can't read %q: %s", yamlDir, err)
}
diff --git a/internal/database/load.go b/internal/database/load.go
index 4061c54..212f2f8 100644
--- a/internal/database/load.go
+++ b/internal/database/load.go
@@ -7,7 +7,7 @@
import (
"encoding/json"
"fmt"
- "io/ioutil"
+ "os"
"path/filepath"
"strings"
@@ -46,7 +46,7 @@
var loadDir func(string) error
loadDir = func(path string) error {
- dir, err := ioutil.ReadDir(path)
+ dir, err := os.ReadDir(path)
if err != nil {
return err
}
@@ -58,7 +58,7 @@
}
continue
}
- content, err := ioutil.ReadFile(fpath)
+ content, err := os.ReadFile(fpath)
if err != nil {
return err
}
diff --git a/internal/issues/issues_test.go b/internal/issues/issues_test.go
index ae012a5..c3abe5e 100644
--- a/internal/issues/issues_test.go
+++ b/internal/issues/issues_test.go
@@ -10,7 +10,7 @@
import (
"context"
"flag"
- "io/ioutil"
+ "os"
"strings"
"testing"
@@ -37,7 +37,7 @@
if *githubTokenFile == "" {
t.Fatal("need -ghtokenfile")
}
- data, err := ioutil.ReadFile(*githubTokenFile)
+ data, err := os.ReadFile(*githubTokenFile)
if err != nil {
t.Fatal(err)
}
diff --git a/internal/worker/gen_false_positives.go b/internal/worker/gen_false_positives.go
index df797e0..9c13789 100644
--- a/internal/worker/gen_false_positives.go
+++ b/internal/worker/gen_false_positives.go
@@ -22,7 +22,6 @@
"context"
"fmt"
"go/format"
- "io/ioutil"
"log"
"os"
"strings"
@@ -288,7 +287,7 @@
if err != nil {
return err
}
- return ioutil.WriteFile("false_positive_records.gen.go", src, 0644)
+ return os.WriteFile("false_positive_records.gen.go", src, 0644)
}
func buildCVERecords(repo *git.Repository) ([]*store.CVERecord, error) {
To view, visit change 430855. To unsubscribe, or for help writing mail filters, visit settings.
Gopher Robot (Gerrit)
Sep 15, 2022, 5:05:26 PM9/15/22
to shuang cui, Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Jenny Rakoczy, Meng Zhuo, Ian Lance Taylor, golang-co...@googlegroups.com
Gopher Robot submitted this change.
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
Approvals:
Gopher Robot: TryBots succeeded
Meng Zhuo: Looks good to me, but someone else must approve; Run TryBots
Jenny Rakoczy: Looks good to me, but someone else must approve; Run TryBots; Automatically submit change
Ian Lance Taylor: Run TryBots
Ian Lance Taylor: Looks good to me, approved; Run TryBots
all: replace io/ioutil with io and os package
For #45557
Change-Id: I12784eeadcbb467819307a6ec8008f940f215065
GitHub-Last-Rev: 4cc337ea4a4a7c59d5d9226911ecf0d4a71aa44c
GitHub-Pull-Request: golang/perf#5
Reviewed-on: https://go-review.googlesource.com/c/perf/+/430796
Run-TryBot: Jenny Rakoczy <je...@golang.org>
TryBot-Result: Gopher Robot <go...@golang.org>
Auto-Submit: Jenny Rakoczy <je...@golang.org>
Reviewed-by: Jenny Rakoczy <je...@golang.org>
Run-TryBot: Meng Zhuo <m...@golangcn.org>
Reviewed-by: Ian Lance Taylor <ia...@google.com>
Reviewed-by: Meng Zhuo <m...@golangcn.org>
Run-TryBot: Ian Lance Taylor <ia...@golang.org>
Run-TryBot: Ian Lance Taylor <ia...@google.com>
---
M analysis/app/compare.go
M analysis/app/index.go
M analysis/app/trend.go
M benchfmt/reader_test.go
M benchstat/sort_test.go
M cmd/benchsave/benchsave.go
M cmd/benchsave/oauth.go
M cmd/benchseries/main_test.go
M cmd/benchstat/main_test.go
M internal/diff/diff.go
M storage/app/upload_test.go
M storage/client.go
M storage/client_test.go
M storage/fs/local/local_test.go
14 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/analysis/app/compare.go b/analysis/app/compare.go
index 497df49..c686cc7 100644
--- a/analysis/app/compare.go
+++ b/analysis/app/compare.go
@@ -9,8 +9,8 @@
"errors"
"fmt"
"html/template"
- "io/ioutil"
"net/http"
+ "os"
"path/filepath"
"sort"
"strconv"
@@ -163,7 +163,7 @@
q := r.Form.Get("q")
- tmpl, err := ioutil.ReadFile(filepath.Join(a.BaseDir, "template/compare.html"))
+ tmpl, err := os.ReadFile(filepath.Join(a.BaseDir, "template/compare.html"))
if err != nil {
http.Error(w, err.Error(), 500)
return
diff --git a/analysis/app/index.go b/analysis/app/index.go
index d69aa90..5ae641a 100644
--- a/analysis/app/index.go
+++ b/analysis/app/index.go
@@ -6,8 +6,8 @@
import (
"html/template"
- "io/ioutil"
"net/http"
+ "os"
"path/filepath"
"golang.org/x/perf/storage"
@@ -17,7 +17,7 @@
func (a *App) index(w http.ResponseWriter, r *http.Request) {
ctx := requestContext(r)
- tmpl, err := ioutil.ReadFile(filepath.Join(a.BaseDir, "template/index.html"))
+ tmpl, err := os.ReadFile(filepath.Join(a.BaseDir, "template/index.html"))
if err != nil {
http.Error(w, err.Error(), 500)
return
diff --git a/analysis/app/trend.go b/analysis/app/trend.go
index 312fff6..213e282 100644
--- a/analysis/app/trend.go
+++ b/analysis/app/trend.go
@@ -11,9 +11,9 @@
"encoding/json"
"fmt"
"html/template"
- "io/ioutil"
"math"
"net/http"
+ "os"
"path/filepath"
"sort"
"strconv"
@@ -39,7 +39,7 @@
q := r.Form.Get("q")
- tmpl, err := ioutil.ReadFile(filepath.Join(a.BaseDir, "template/trend.html"))
+ tmpl, err := os.ReadFile(filepath.Join(a.BaseDir, "template/trend.html"))
if err != nil {
http.Error(w, err.Error(), 500)
return
diff --git a/benchfmt/reader_test.go b/benchfmt/reader_test.go
index 9636dff..b1bad87 100644
--- a/benchfmt/reader_test.go
+++ b/benchfmt/reader_test.go
@@ -8,7 +8,6 @@
"bytes"
"fmt"
"io"
- "io/ioutil"
"os"
"path/filepath"
"reflect"
@@ -283,7 +282,7 @@
func BenchmarkReader(b *testing.B) {
path := "testdata/bent"
- fileInfos, err := ioutil.ReadDir(path)
+ fileInfos, err := os.ReadDir(path)
if err != nil {
b.Fatal("reading test data directory: ", err)
}
diff --git a/benchstat/sort_test.go b/benchstat/sort_test.go
index 878d3f4..9fdb363 100644
--- a/benchstat/sort_test.go
+++ b/benchstat/sort_test.go
@@ -5,8 +5,8 @@
package benchstat
import (
- "io/ioutil"
"log"
+ "os"
"runtime"
"sort"
"testing"
@@ -76,11 +76,11 @@
t.Skipf("files not available on GOOS=%s", runtime.GOOS)
}
sampleCompareCollection := Collection{Alpha: 0.05, AddGeoMean: false, DeltaTest: UTest}
- file1Data, err := ioutil.ReadFile(file1)
+ file1Data, err := os.ReadFile(file1)
if err != nil {
log.Fatal(err)
}
- file2Data, err := ioutil.ReadFile(file2)
+ file2Data, err := os.ReadFile(file2)
if err != nil {
log.Fatal(err)
}
@@ -101,7 +101,7 @@
t.Skipf("files not available on GOOS=%s", runtime.GOOS)
}
sampleCollection := Collection{Alpha: 0.05, AddGeoMean: false, DeltaTest: UTest}
- file1Data, err1 := ioutil.ReadFile(file1)
+ file1Data, err1 := os.ReadFile(file1)
if err1 != nil {
log.Fatal(err1)
}
diff --git a/cmd/benchsave/benchsave.go b/cmd/benchsave/benchsave.go
index 51f32c4..5a41f1d 100644
--- a/cmd/benchsave/benchsave.go
+++ b/cmd/benchsave/benchsave.go
@@ -21,7 +21,6 @@
"flag"
"fmt"
"io"
- "io/ioutil"
"log"
"mime"
"net/http"
@@ -86,7 +85,7 @@
var headerData []byte
if *header != "" {
var err error
- headerData, err = ioutil.ReadFile(*header)
+ headerData, err = os.ReadFile(*header)
if err != nil {
log.Fatal(err)
}
diff --git a/cmd/benchsave/oauth.go b/cmd/benchsave/oauth.go
index 1905d66..a5193d9 100644
--- a/cmd/benchsave/oauth.go
+++ b/cmd/benchsave/oauth.go
@@ -8,7 +8,6 @@
"context"
"encoding/json"
"fmt"
- "io/ioutil"
"log"
"os"
"os/user"
@@ -105,7 +104,7 @@
// readToken obtains a token from the filesystem.
// If there is no valid token found, it returns a nil token and a reason.
func readToken() (*oauth2.Token, error) {
- data, err := ioutil.ReadFile(tokenFilePath())
+ data, err := os.ReadFile(tokenFilePath())
if err != nil {
return nil, err
}
@@ -126,5 +125,5 @@
if err != nil {
return err
}
- return ioutil.WriteFile(p, data, 0600)
+ return os.WriteFile(p, data, 0600)
}
diff --git a/cmd/benchseries/main_test.go b/cmd/benchseries/main_test.go
index 529a51a..0319404 100644
--- a/cmd/benchseries/main_test.go
+++ b/cmd/benchseries/main_test.go
@@ -9,7 +9,6 @@
"encoding/json"
"flag"
"io"
- "io/ioutil"
"os"
"path/filepath"
@@ -72,7 +71,7 @@
bo := writeJsonBytes(oddComparisons)
eref := filepath.Join("testdata", evenReference)
- re, err := ioutil.ReadFile(eref)
+ re, err := os.ReadFile(eref)
if err != nil {
t.Log(err)
t.Fail()
@@ -80,7 +79,7 @@
compareBytes(t, be, re, "calculated even bytes", eref)
oref := filepath.Join("testdata", oddReference)
- ro, err := ioutil.ReadFile(oref)
+ ro, err := os.ReadFile(oref)
if err != nil {
t.Log(err)
t.Fail()
diff --git a/cmd/benchstat/main_test.go b/cmd/benchstat/main_test.go
index ed8aba9..50f54dc 100644
--- a/cmd/benchstat/main_test.go
+++ b/cmd/benchstat/main_test.go
@@ -7,7 +7,7 @@
import (
"bytes"
"flag"
- "io/ioutil"
+ "io"
"os"
"os/exec"
"path/filepath"
@@ -69,7 +69,7 @@
}
c := make(chan []byte)
go func() {
- data, err := ioutil.ReadAll(r)
+ data, err := io.ReadAll(r)
if err != nil {
t.Error(err)
}
@@ -94,7 +94,7 @@
exit = os.Exit
data := <-c
- golden, err := ioutil.ReadFile(name + ".golden")
+ golden, err := os.ReadFile(name + ".golden")
if err != nil {
t.Fatal(err)
}
@@ -115,7 +115,7 @@
}
func writeTemp(t *testing.T, data []byte) string {
- f, err := ioutil.TempFile("", "benchstat_test")
+ f, err := os.CreateTemp("", "benchstat_test")
if err != nil {
t.Fatal(err)
}
diff --git a/internal/diff/diff.go b/internal/diff/diff.go
index bc6b9a2..a66d33d 100644
--- a/internal/diff/diff.go
+++ b/internal/diff/diff.go
@@ -6,14 +6,13 @@
import (
"fmt"
- "io/ioutil"
"os"
"os/exec"
"runtime"
)
func writeTempFile(dir, prefix string, data []byte) (string, error) {
- file, err := ioutil.TempFile(dir, prefix)
+ file, err := os.CreateTemp(dir, prefix)
if err != nil {
return "", err
}
diff --git a/storage/app/upload_test.go b/storage/app/upload_test.go
index 237bb61..d06643b 100644
--- a/storage/app/upload_test.go
+++ b/storage/app/upload_test.go
@@ -11,7 +11,6 @@
"encoding/json"
"fmt"
"io"
- "io/ioutil"
"mime/multipart"
"net/http"
"net/http/httptest"
@@ -83,7 +82,7 @@
if resp.StatusCode != 200 {
t.Fatalf("post /upload: %v", resp.Status)
}
- body, err := ioutil.ReadAll(resp.Body)
+ body, err := io.ReadAll(resp.Body)
if err != nil {
t.Fatalf("reading /upload response: %v", err)
}
diff --git a/storage/client.go b/storage/client.go
index eee6439..12d6ce2 100644
--- a/storage/client.go
+++ b/storage/client.go
@@ -11,7 +11,6 @@
"encoding/json"
"fmt"
"io"
- "io/ioutil"
"mime/multipart"
"net/http"
"net/url"
@@ -54,7 +53,7 @@
}
if resp.StatusCode != 200 {
defer resp.Body.Close()
- body, err := ioutil.ReadAll(resp.Body)
+ body, err := io.ReadAll(resp.Body)
if err != nil {
return &Query{err: err}
}
@@ -148,7 +147,7 @@
return &UploadList{err: err}
}
if resp.StatusCode != 200 {
- body, err := ioutil.ReadAll(resp.Body)
+ body, err := io.ReadAll(resp.Body)
if err != nil {
return &UploadList{err: err}
}
@@ -240,7 +239,7 @@
}
defer resp.Body.Close()
if resp.StatusCode != 200 {
- body, _ := ioutil.ReadAll(resp.Body)
+ body, _ := io.ReadAll(resp.Body)
errCh <- fmt.Errorf("upload failed: %v\n%s", resp.Status, body)
return
}
diff --git a/storage/client_test.go b/storage/client_test.go
index 6e5b87e..d740444 100644
--- a/storage/client_test.go
+++ b/storage/client_test.go
@@ -8,7 +8,6 @@
"bytes"
"fmt"
"io"
- "io/ioutil"
"net/http"
"net/http/httptest"
"reflect"
@@ -119,7 +118,7 @@
if have, want := p.FileName(), fmt.Sprintf("want%d.txt", i); have != want {
t.Errorf("file name = %q, want %q", have, want)
}
- content, _ := ioutil.ReadAll(p)
+ content, _ := io.ReadAll(p)
if have, want := string(content), "content"; have != want {
t.Errorf("unexpected content %q, want %q", have, want)
}
@@ -177,7 +176,7 @@
if have, want := p.FileName(), fmt.Sprintf("want%d.txt", i); have != want {
t.Errorf("file name = %q, want %q", have, want)
}
- content, _ := ioutil.ReadAll(p)
+ content, _ := io.ReadAll(p)
if have, want := string(content), "content"; have != want {
t.Errorf("unexpected content %q, want %q", have, want)
}
diff --git a/storage/fs/local/local_test.go b/storage/fs/local/local_test.go
index b34ab23..0697b99 100644
--- a/storage/fs/local/local_test.go
+++ b/storage/fs/local/local_test.go
@@ -6,7 +6,6 @@
import (
"context"
- "io/ioutil"
"os"
"path/filepath"
"testing"
@@ -17,7 +16,7 @@
func TestNewWriter(t *testing.T) {
ctx := context.Background()
- dir, err := ioutil.TempDir("", "local_test")
+ dir, err := os.MkdirTemp("", "local_test")
if err != nil {
t.Fatalf("TempDir = %v", err)
}
@@ -40,7 +39,7 @@
t.Fatalf("Close = %v", err)
}
- have, err := ioutil.ReadFile(filepath.Join(dir, "dir/file"))
+ have, err := os.ReadFile(filepath.Join(dir, "dir/file"))
if err != nil {
t.Fatalf("ReadFile = %v", err)
}
To view, visit change 430796. To unsubscribe, or for help writing mail filters, visit settings.
Gopher Robot (Gerrit)
Sep 15, 2022, 5:06:13 PM9/15/22
to shuang cui, Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Jenny Rakoczy, Meng Zhuo, Ian Lance Taylor, golang-co...@googlegroups.com
Gopher Robot submitted this change.
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
Approvals:
Ian Lance Taylor: Run TryBots
Ian Lance Taylor: Looks good to me, approved; Run TryBots
Jenny Rakoczy: Looks good to me, but someone else must approve; Run TryBots; Automatically submit change
Gopher Robot: TryBots succeeded
Meng Zhuo: Looks good to me, but someone else must approve; Run TryBots
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 <je...@golang.org>
Reviewed-by: Jenny Rakoczy <je...@golang.org>
TryBot-Result: Gopher Robot <go...@golang.org>
Run-TryBot: Ian Lance Taylor <ia...@google.com>
Run-TryBot: Ian Lance Taylor <ia...@golang.org>
Reviewed-by: Meng Zhuo <m...@golangcn.org>
Reviewed-by: Ian Lance Taylor <ia...@google.com>
Run-TryBot: Meng Zhuo <m...@golangcn.org>
Auto-Submit: Jenny Rakoczy <je...@golang.org>
---
M apidiff/apidiff_test.go
M cmd/gorelease/gorelease.go
M cmd/gorelease/gorelease_test.go
M cmd/gorelease/proxy_test.go
M cmd/macos-roots-test/root_darwin.go
M cmd/txtar/txtar.go
M cmd/txtar/txtar_test.go
M ebnflint/ebnflint.go
M event/adapter/stdlib/bench_test.go
M event/alloc_test.go
M mmap/mmap_test.go
M shiny/driver/internal/x11key/gen.go
M shiny/iconvg/decode_test.go
M shiny/iconvg/encode_test.go
M shiny/iconvg/example_test.go
M shiny/iconvg/upgrade_test.go
M shiny/materialdesign/colornames/gen.go
M shiny/materialdesign/icons/gen.go
M shiny/text/text_test.go
M shootout/k-nucleotide-parallel.go
M shootout/k-nucleotide.go
M shootout/regex-dna-parallel.go
M shootout/regex-dna.go
M sumdb/gosumcheck/main.go
M sumdb/internal/tlog/ct_test.go
25 files changed, 100 insertions(+), 92 deletions(-)
diff --git a/apidiff/apidiff_test.go b/apidiff/apidiff_test.go
index 9d55e14..a13009d 100644
--- a/apidiff/apidiff_test.go
+++ b/apidiff/apidiff_test.go
@@ -4,7 +4,6 @@
"bufio"
"fmt"
"go/types"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -18,7 +17,7 @@
)
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 @@
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 b0ee1e9..5c2342e 100644
--- a/cmd/gorelease/gorelease.go
+++ b/cmd/gorelease/gorelease.go
@@ -88,7 +88,6 @@
"fmt"
"go/build"
"io"
- "io/ioutil"
"log"
"os"
"os/exec"
@@ -166,7 +165,7 @@
// 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 @@
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 @@
// 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 @@
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 @@
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 @@
}
}()
- tmpDir, err := ioutil.TempDir("", "")
+ tmpDir, err := os.MkdirTemp("", "")
if err != nil {
return nil, err
}
@@ -882,7 +881,7 @@
}
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 @@
os.Remove(zipFile.Name())
}()
- dir, err = ioutil.TempDir("", "gorelease")
+ dir, err = os.MkdirTemp("", "gorelease")
if err != nil {
return "", err
}
@@ -980,7 +979,7 @@
// 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 @@
}
}
- 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 @@
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 @@
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 @@
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 @@
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 216c747..47d0892 100644
--- a/cmd/gorelease/gorelease_test.go
+++ b/cmd/gorelease/gorelease_test.go
@@ -9,7 +9,6 @@
"context"
"flag"
"fmt"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -61,7 +60,7 @@
}
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 @@
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_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 @@
// 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 @@
// 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 @@
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 @@
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 d91d983..d5fefd9 100644
--- a/cmd/gorelease/proxy_test.go
+++ b/cmd/gorelease/proxy_test.go
@@ -8,7 +8,6 @@
"bytes"
"fmt"
"io"
- "io/ioutil"
"os"
"path/filepath"
"sort"
@@ -30,7 +29,7 @@
// 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 @@
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 @@
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 @@
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 @@
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 @@
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 b5bf0f7..46f8c39 100644
--- a/cmd/macos-roots-test/root_darwin.go
+++ b/cmd/macos-roots-test/root_darwin.go
@@ -9,7 +9,6 @@
"crypto/x509"
"encoding/pem"
"fmt"
- "io/ioutil"
"os"
"os/exec"
"os/user"
@@ -142,7 +141,7 @@
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 9beb163..85219e5 100644
--- a/cmd/txtar/txtar.go
+++ b/cmd/txtar/txtar.go
@@ -34,7 +34,7 @@
"bytes"
"flag"
"fmt"
- "io/ioutil"
+ "io"
"os"
"path"
"path/filepath"
@@ -79,7 +79,7 @@
}
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 @@
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 @@
}
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 @@
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 ea9f2bf..2242240 100644
--- a/cmd/txtar/txtar_test.go
+++ b/cmd/txtar/txtar_test.go
@@ -6,7 +6,6 @@
import (
"fmt"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -41,7 +40,7 @@
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 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 @@
}
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 bf8ad54..966dadf 100644
--- a/ebnflint/ebnflint.go
+++ b/ebnflint/ebnflint.go
@@ -11,7 +11,6 @@
"go/scanner"
"go/token"
"io"
- "io/ioutil"
"os"
"path/filepath"
@@ -105,7 +104,7 @@
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 35cdd29..da5ddd1 100644
--- a/event/adapter/stdlib/bench_test.go
+++ b/event/adapter/stdlib/bench_test.go
@@ -8,7 +8,6 @@
"context"
"fmt"
"io"
- "io/ioutil"
"log"
"testing"
@@ -94,7 +93,7 @@
}
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 5144645..533ef9c 100644
--- a/event/alloc_test.go
+++ b/event/alloc_test.go
@@ -9,7 +9,7 @@
import (
"context"
- "io/ioutil"
+ "io"
"testing"
"golang.org/x/exp/event"
@@ -21,7 +21,7 @@
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 797fc5f..0716cc4 100644
--- a/mmap/mmap_test.go
+++ b/mmap/mmap_test.go
@@ -7,7 +7,7 @@
import (
"bytes"
"io"
- "io/ioutil"
+ "os"
"testing"
)
@@ -21,9 +21,9 @@
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 4af0660..3ce4f1e 100644
--- a/shiny/driver/internal/x11key/gen.go
+++ b/shiny/driver/internal/x11key/gen.go
@@ -13,7 +13,6 @@
"bytes"
"fmt"
"go/format"
- "io/ioutil"
"log"
"os"
"regexp"
@@ -68,7 +67,7 @@
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 82356f0..33b0b7d 100644
--- a/shiny/iconvg/decode_test.go
+++ b/shiny/iconvg/decode_test.go
@@ -11,7 +11,6 @@
"image/color"
"image/draw"
"image/png"
- "io/ioutil"
"os"
"path/filepath"
"runtime"
@@ -147,7 +146,7 @@
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 @@
}
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 @@
// 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 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 0f41f52..57aa451 100644
--- a/shiny/iconvg/encode_test.go
+++ b/shiny/iconvg/encode_test.go
@@ -8,8 +8,8 @@
"bytes"
"flag"
"image/color"
- "io/ioutil"
"math"
+ "os"
"path/filepath"
"runtime"
"strconv"
@@ -28,12 +28,12 @@
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 879a1d0..7796625 100644
--- a/shiny/iconvg/example_test.go
+++ b/shiny/iconvg/example_test.go
@@ -7,7 +7,6 @@
import (
"image"
"image/draw"
- "io/ioutil"
"log"
"os"
"path/filepath"
@@ -16,7 +15,7 @@
)
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 00a1968..0b4b175 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 3969d8b..f663952 100644
--- a/shiny/materialdesign/colornames/gen.go
+++ b/shiny/materialdesign/colornames/gen.go
@@ -15,7 +15,6 @@
"go/format"
"image/color"
"io"
- "io/ioutil"
"log"
"net/http"
"strings"
@@ -174,7 +173,7 @@
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 473d2a7..2e95bfc 100644
--- a/shiny/materialdesign/icons/gen.go
+++ b/shiny/materialdesign/icons/gen.go
@@ -15,7 +15,6 @@
"fmt"
"go/format"
"io"
- "io/ioutil"
"log"
"os"
"path"
@@ -169,7 +168,7 @@
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 @@
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 @@
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 a2eedb9..7c93212 100644
--- a/shiny/text/text_test.go
+++ b/shiny/text/text_test.go
@@ -9,7 +9,6 @@
"fmt"
"image"
"io"
- "io/ioutil"
"math/rand"
"reflect"
"sort"
@@ -207,7 +206,7 @@
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 8b25419..75e2c8f 100644
--- a/shootout/k-nucleotide-parallel.go
+++ b/shootout/k-nucleotide-parallel.go
@@ -42,7 +42,7 @@
"bufio"
"bytes"
"fmt"
- "io/ioutil"
+ "io"
"os"
"runtime"
"sort"
@@ -114,7 +114,7 @@
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 efc8d95..6fc535d 100644
--- a/shootout/k-nucleotide.go
+++ b/shootout/k-nucleotide.go
@@ -42,7 +42,7 @@
"bufio"
"bytes"
"fmt"
- "io/ioutil"
+ "io"
"os"
"sort"
)
@@ -115,7 +115,7 @@
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 68ccd76..49bb559 100644
--- a/shootout/regex-dna-parallel.go
+++ b/shootout/regex-dna-parallel.go
@@ -40,7 +40,7 @@
import (
"fmt"
- "io/ioutil"
+ "io"
"os"
"regexp"
"runtime"
@@ -92,7 +92,7 @@
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 85e1939..2f44137 100644
--- a/shootout/regex-dna.go
+++ b/shootout/regex-dna.go
@@ -40,7 +40,7 @@
import (
"fmt"
- "io/ioutil"
+ "io"
"os"
"regexp"
)
@@ -90,7 +90,7 @@
}
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 cd7aef2..ddd7400 100644
--- a/sumdb/gosumcheck/main.go
+++ b/sumdb/gosumcheck/main.go
@@ -34,7 +34,6 @@
"flag"
"fmt"
"io"
- "io/ioutil"
"log"
"net/http"
"os"
@@ -84,7 +83,7 @@
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 @@
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 c2d9aeb..f8c364b 100644
--- a/sumdb/internal/tlog/ct_test.go
+++ b/sumdb/internal/tlog/ct_test.go
@@ -7,7 +7,7 @@
import (
"encoding/json"
"fmt"
- "io/ioutil"
+ "io"
"net/http"
"net/url"
"os"
@@ -80,7 +80,7 @@
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)
}
To view, visit change 430795. To unsubscribe, or for help writing mail filters, visit settings.
Gopher Robot (Gerrit)
Sep 19, 2022, 11:59:12 AM9/19/22
to shuang cui, Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Cherry Mui, Meng Zhuo, Ian Lance Taylor, Marcel van Lohuizen, golang-co...@googlegroups.com
Approvals:
Ian Lance Taylor: Looks good to me, approved; Run TryBots; Automatically submit change
Gopher Robot: TryBots succeeded
Meng Zhuo: Looks good to me, but someone else must approve; Run TryBots
Cherry Mui: Looks good to me, but someone else must approve
all: replace io/ioutil with io and os package
For golang/go#45557
Change-Id: Ibf78d87cc94baa0d1696e5abc2edad3d2723e42b
GitHub-Last-Rev: ad314caaff6e51edb51a63d183c0ff906cf6b2ad
GitHub-Pull-Request: golang/text#34
Reviewed-on: https://go-review.googlesource.com/c/text/+/430815
Reviewed-by: Cherry Mui <cher...@google.com>
TryBot-Result: Gopher Robot <go...@golang.org>
Reviewed-by: Ian Lance Taylor <ia...@google.com>
Reviewed-by: Meng Zhuo <m...@golangcn.org>
Run-TryBot: Ian Lance Taylor <ia...@google.com>
Run-TryBot: Meng Zhuo <m...@golangcn.org>
Auto-Submit: Ian Lance Taylor <ia...@google.com>
---
M cases/gen.go
M cmd/gotext/main.go
M collate/maketables.go
M collate/reg_test.go
M encoding/encoding_test.go
M encoding/internal/enctest/enctest.go
M encoding/traditionalchinese/all_test.go
M feature/plural/message.go
M gen.go
M internal/cldrtree/cldrtree_test.go
M internal/gen/bitfield/bitfield_test.go
M internal/gen/gen.go
M internal/language/gen.go
M internal/testtext/codesize.go
M internal/triegen/example_compact_test.go
M internal/triegen/example_test.go
M message/pipeline/pipeline_test.go
M transform/transform_test.go
M unicode/cldr/decode.go
M unicode/cldr/makexml.go
M unicode/norm/normalize_test.go
21 files changed, 77 insertions(+), 69 deletions(-)
diff --git a/cases/gen.go b/cases/gen.go
index a041fed..2e1d95c 100644
--- a/cases/gen.go
+++ b/cases/gen.go
@@ -16,7 +16,6 @@
"bytes"
"fmt"
"io"
- "io/ioutil"
"log"
"reflect"
"strconv"
@@ -635,9 +634,9 @@
// We discard the output as we know we have perfect functions. We run them
// just to verify the properties are correct.
- n := printProperties(ioutil.Discard, "DerivedCoreProperties.txt", "Cased", verifyCased)
- n += printProperties(ioutil.Discard, "DerivedCoreProperties.txt", "Lowercase", verifyLower)
- n += printProperties(ioutil.Discard, "DerivedCoreProperties.txt", "Uppercase", verifyUpper)
+ n := printProperties(io.Discard, "DerivedCoreProperties.txt", "Cased", verifyCased)
+ n += printProperties(io.Discard, "DerivedCoreProperties.txt", "Lowercase", verifyLower)
+ n += printProperties(io.Discard, "DerivedCoreProperties.txt", "Uppercase", verifyUpper)
if n > 0 {
log.Fatalf("One of the discarded properties does not have a perfect filter.")
}
diff --git a/cmd/gotext/main.go b/cmd/gotext/main.go
index c8dc799..aad1d4a 100644
--- a/cmd/gotext/main.go
+++ b/cmd/gotext/main.go
@@ -16,7 +16,6 @@
"go/build"
"go/format"
"io"
- "io/ioutil"
"log"
"os"
"strings"
@@ -310,7 +309,7 @@
if err != nil {
logf("Could not format generated docs: %v\n", err)
}
- if err := ioutil.WriteFile("doc.go", b, 0666); err != nil {
+ if err := os.WriteFile("doc.go", b, 0666); err != nil {
logf("Could not create file alldocs.go: %v\n", err)
}
} else {
diff --git a/collate/maketables.go b/collate/maketables.go
index 59afeb9..4175143 100644
--- a/collate/maketables.go
+++ b/collate/maketables.go
@@ -17,7 +17,6 @@
"flag"
"fmt"
"io"
- "io/ioutil"
"log"
"os"
"regexp"
@@ -187,7 +186,7 @@
func openArchive() *zip.Reader {
f := gen.OpenCLDRCoreZip()
- buffer, err := ioutil.ReadAll(f)
+ buffer, err := io.ReadAll(f)
f.Close()
failOnError(err)
archive, err := zip.NewReader(bytes.NewReader(buffer), int64(len(buffer)))
diff --git a/collate/reg_test.go b/collate/reg_test.go
index 4d35984..f9c192c 100644
--- a/collate/reg_test.go
+++ b/collate/reg_test.go
@@ -10,7 +10,6 @@
"bytes"
"flag"
"io"
- "io/ioutil"
"log"
"path"
"regexp"
@@ -133,7 +132,7 @@
func loadTestData() []Test {
f := gen.OpenUnicodeFile("UCA", "", "CollationTest.zip")
- buffer, err := ioutil.ReadAll(f)
+ buffer, err := io.ReadAll(f)
f.Close()
Error(err)
archive, err := zip.NewReader(bytes.NewReader(buffer), int64(len(buffer)))
diff --git a/encoding/encoding_test.go b/encoding/encoding_test.go
index 1738147..e459fa2 100644
--- a/encoding/encoding_test.go
+++ b/encoding/encoding_test.go
@@ -5,7 +5,7 @@
package encoding_test
import (
- "io/ioutil"
+ "io"
"strings"
"testing"
@@ -62,7 +62,7 @@
want = "AB\x00CD\ufffdYZ"
}
sr := strings.NewReader("AB\x00CD\x80YZ")
- g, err := ioutil.ReadAll(transform.NewReader(sr, enc))
+ g, err := io.ReadAll(transform.NewReader(sr, enc))
if err != nil {
t.Errorf("%s: ReadAll: %v", direction, err)
continue
diff --git a/encoding/internal/enctest/enctest.go b/encoding/internal/enctest/enctest.go
index 0cccae0..cf5da26 100644
--- a/encoding/internal/enctest/enctest.go
+++ b/encoding/internal/enctest/enctest.go
@@ -8,7 +8,7 @@
"bytes"
"fmt"
"io"
- "io/ioutil"
+ "os"
"strings"
"testing"
@@ -105,7 +105,7 @@
b.ResetTimer()
for i := 0; i < b.N; i++ {
r := transform.NewReader(bytes.NewReader(src), transformer)
- io.Copy(ioutil.Discard, r)
+ io.Copy(io.Discard, r)
}
})
}
@@ -157,15 +157,15 @@
dstFile, srcFile = srcFile, dstFile
coder = enc.NewDecoder()
}
- dst, err := ioutil.ReadFile(dstFile)
+ dst, err := os.ReadFile(dstFile)
if err != nil {
- if dst, err = ioutil.ReadFile("../" + dstFile); err != nil {
+ if dst, err = os.ReadFile("../" + dstFile); err != nil {
return nil, nil, nil, err
}
}
- src, err := ioutil.ReadFile(srcFile)
+ src, err := os.ReadFile(srcFile)
if err != nil {
- if src, err = ioutil.ReadFile("../" + srcFile); err != nil {
+ if src, err = os.ReadFile("../" + srcFile); err != nil {
return nil, nil, nil, err
}
}
diff --git a/encoding/traditionalchinese/all_test.go b/encoding/traditionalchinese/all_test.go
index 3825c76..f804e83 100644
--- a/encoding/traditionalchinese/all_test.go
+++ b/encoding/traditionalchinese/all_test.go
@@ -6,7 +6,7 @@
import (
"fmt"
- "io/ioutil"
+ "io"
"strings"
"testing"
@@ -103,7 +103,7 @@
"\x88\xa2\x88\xa3\x88\xa4\x88\xa5\x88\xa6"
want := "ÓǑÒ\u00ca\u0304Ế\u00ca\u030cỀÊ " +
"ü\u00ea\u0304ế\u00ea\u030cề"
- dst, err := ioutil.ReadAll(transform.NewReader(
+ dst, err := io.ReadAll(transform.NewReader(
strings.NewReader(src), Big5.NewDecoder()))
if err != nil {
t.Fatal(err)
diff --git a/feature/plural/message.go b/feature/plural/message.go
index 6248d01..56d518c 100644
--- a/feature/plural/message.go
+++ b/feature/plural/message.go
@@ -6,7 +6,7 @@
import (
"fmt"
- "io/ioutil"
+ "io"
"reflect"
"strconv"
@@ -56,7 +56,7 @@
func Selectf(arg int, format string, cases ...interface{}) catalog.Message {
var p parser
// Intercept the formatting parameters of format by doing a dummy print.
- fmt.Fprintf(ioutil.Discard, format, &p)
+ fmt.Fprintf(io.Discard, format, &p)
m := &message{arg, kindDefault, 0, cases}
switch p.verb {
case 'g':
diff --git a/gen.go b/gen.go
index fb2fb94..566a303 100644
--- a/gen.go
+++ b/gen.go
@@ -14,7 +14,6 @@
"flag"
"fmt"
"go/format"
- "io/ioutil"
"os"
"os/exec"
"path"
@@ -256,7 +255,7 @@
filepath.Dir(file) != dirSrc {
return nil
}
- b, err := ioutil.ReadFile(file)
+ b, err := os.ReadFile(file)
if err != nil || bytes.Contains(b, []byte("\n// +build ignore")) {
return err
}
@@ -275,7 +274,7 @@
}
file = filepath.Join(dirDst, base)
vprintf("=== COPY %s\n", file)
- return ioutil.WriteFile(file, b, 0666)
+ return os.WriteFile(file, b, 0666)
})
if err != nil {
fmt.Println("Copying exported files failed:", err)
diff --git a/internal/cldrtree/cldrtree_test.go b/internal/cldrtree/cldrtree_test.go
index 06c366a..c42eba3 100644
--- a/internal/cldrtree/cldrtree_test.go
+++ b/internal/cldrtree/cldrtree_test.go
@@ -7,9 +7,9 @@
import (
"bytes"
"flag"
- "io/ioutil"
"log"
"math/rand"
+ "os"
"path/filepath"
"reflect"
"regexp"
@@ -303,11 +303,11 @@
file := filepath.Join("testdata", tc, "output.go")
if *genOutput {
- ioutil.WriteFile(file, got, 0700)
+ os.WriteFile(file, got, 0700)
t.SkipNow()
}
- b, err := ioutil.ReadFile(file)
+ b, err := os.ReadFile(file)
if err != nil {
t.Fatalf("failed to open file: %v", err)
}
diff --git a/internal/gen/bitfield/bitfield_test.go b/internal/gen/bitfield/bitfield_test.go
index 789f86d..a43dda9 100644
--- a/internal/gen/bitfield/bitfield_test.go
+++ b/internal/gen/bitfield/bitfield_test.go
@@ -7,7 +7,7 @@
import (
"bytes"
"fmt"
- "io/ioutil"
+ "os"
"testing"
)
@@ -222,7 +222,7 @@
`
func mustRead(filename string) string {
- b, err := ioutil.ReadFile(filename)
+ b, err := os.ReadFile(filename)
if err != nil {
panic(err)
}
diff --git a/internal/gen/gen.go b/internal/gen/gen.go
index fa28953..268258d 100644
--- a/internal/gen/gen.go
+++ b/internal/gen/gen.go
@@ -25,7 +25,6 @@
"go/build"
"go/format"
"io"
- "io/ioutil"
"log"
"net/http"
"os"
@@ -175,7 +174,7 @@
if err := os.MkdirAll(dir, permissions); err != nil {
log.Fatalf("Could not create directory: %v", err)
}
- ioutil.WriteFile(readme, []byte(readmeTxt), permissions)
+ os.WriteFile(readme, []byte(readmeTxt), permissions)
}
return dir
}
@@ -213,15 +212,15 @@
}
r := get(urlRoot, path)
defer r.Close()
- b, err := ioutil.ReadAll(r)
+ b, err := io.ReadAll(r)
if err != nil {
log.Fatalf("Could not download file: %v", err)
}
os.MkdirAll(filepath.Dir(file), permissions)
- if err := ioutil.WriteFile(file, b, permissions); err != nil {
+ if err := os.WriteFile(file, b, permissions); err != nil {
log.Fatalf("Could not create file: %v", err)
}
- return ioutil.NopCloser(bytes.NewReader(b))
+ return io.NopCloser(bytes.NewReader(b))
}
func get(root, path string) io.ReadCloser {
@@ -280,13 +279,13 @@
func updateBuildTags(pattern string) {
for _, t := range tags {
oldFile := fmt.Sprintf(pattern, t.version)
- b, err := ioutil.ReadFile(oldFile)
+ b, err := os.ReadFile(oldFile)
if err != nil {
continue
}
build := fmt.Sprintf("// +build %s", t.buildTags)
b = regexp.MustCompile(`// \+build .*`).ReplaceAll(b, []byte(build))
- err = ioutil.WriteFile(oldFile, b, 0644)
+ err = os.WriteFile(oldFile, b, 0644)
if err != nil {
log.Fatal(err)
}
@@ -334,7 +333,7 @@
// Repackage rewrites a Go file from belonging to package main to belonging to
// the given package.
func Repackage(inFile, outFile, pkg string) {
- src, err := ioutil.ReadFile(inFile)
+ src, err := os.ReadFile(inFile)
if err != nil {
log.Fatalf("reading %s: %v", inFile, err)
}
diff --git a/internal/language/gen.go b/internal/language/gen.go
index 95455ec..520f159 100644
--- a/internal/language/gen.go
+++ b/internal/language/gen.go
@@ -15,7 +15,6 @@
"flag"
"fmt"
"io"
- "io/ioutil"
"log"
"math"
"reflect"
@@ -921,7 +920,7 @@
r := gen.OpenIANAFile("domains/root/db")
defer r.Close()
- buf, err := ioutil.ReadAll(r)
+ buf, err := io.ReadAll(r)
failOnError(err)
re := regexp.MustCompile(`"/domains/root/db/([a-z]{2}).html"`)
for _, m := range re.FindAllSubmatch(buf, -1) {
diff --git a/internal/testtext/codesize.go b/internal/testtext/codesize.go
index 88df487..cdaed81 100644
--- a/internal/testtext/codesize.go
+++ b/internal/testtext/codesize.go
@@ -7,7 +7,6 @@
import (
"bytes"
"fmt"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -26,13 +25,13 @@
// See dict_test.go in the display package for an example.
func CodeSize(s string) (int, error) {
// Write the file.
- tmpdir, err := ioutil.TempDir(os.TempDir(), "testtext")
+ tmpdir, err := os.MkdirTemp(os.TempDir(), "testtext")
if err != nil {
return 0, fmt.Errorf("testtext: failed to create tmpdir: %v", err)
}
defer os.RemoveAll(tmpdir)
filename := filepath.Join(tmpdir, "main.go")
- if err := ioutil.WriteFile(filename, []byte(s), 0644); err != nil {
+ if err := os.WriteFile(filename, []byte(s), 0644); err != nil {
return 0, fmt.Errorf("testtext: failed to write main.go: %v", err)
}
diff --git a/internal/triegen/example_compact_test.go b/internal/triegen/example_compact_test.go
index 7cf604c..95486d1 100644
--- a/internal/triegen/example_compact_test.go
+++ b/internal/triegen/example_compact_test.go
@@ -7,7 +7,6 @@
import (
"fmt"
"io"
- "io/ioutil"
"golang.org/x/text/internal/triegen"
)
@@ -17,12 +16,12 @@
for r := rune(0); r < 10000; r += 64 {
t.Insert(r, 0x9015BADA55^uint64(r))
}
- sz, _ := t.Gen(ioutil.Discard)
+ sz, _ := t.Gen(io.Discard)
fmt.Printf("Size normal: %5d\n", sz)
var c myCompacter
- sz, _ = t.Gen(ioutil.Discard, triegen.Compact(&c))
+ sz, _ = t.Gen(io.Discard, triegen.Compact(&c))
fmt.Printf("Size compacted: %5d\n", sz)
diff --git a/internal/triegen/example_test.go b/internal/triegen/example_test.go
index 557a152..5823a2c 100644
--- a/internal/triegen/example_test.go
+++ b/internal/triegen/example_test.go
@@ -6,7 +6,7 @@
import (
"fmt"
- "io/ioutil"
+ "io"
"math/rand"
"unicode"
@@ -15,7 +15,7 @@
const seed = 0x12345
-var genWriter = ioutil.Discard
+var genWriter = io.Discard
func randomRunes() map[rune]uint8 {
rnd := rand.New(rand.NewSource(seed))
diff --git a/message/pipeline/pipeline_test.go b/message/pipeline/pipeline_test.go
index 2adb11f..f4cd42a 100644
--- a/message/pipeline/pipeline_test.go
+++ b/message/pipeline/pipeline_test.go
@@ -11,7 +11,6 @@
"flag"
"fmt"
"go/build"
- "io/ioutil"
"os"
"os/exec"
"path"
@@ -40,7 +39,7 @@
t.Skipf("skipping because 'go' command is unavailable: %v", err)
}
- GOPATH, err := ioutil.TempDir("", "pipeline_test")
+ GOPATH, err := os.MkdirTemp("", "pipeline_test")
if err != nil {
t.Fatal(err)
}
@@ -66,7 +65,7 @@
wd, _ := os.Getwd()
defer os.Chdir(wd)
- dirs, err := ioutil.ReadDir(testdata)
+ dirs, err := os.ReadDir(testdata)
if err != nil {
t.Fatal(err)
}
@@ -124,11 +123,11 @@
return os.MkdirAll(filepath.Join(dst, rel), 0755)
}
- data, err := ioutil.ReadFile(p)
+ data, err := os.ReadFile(p)
if err != nil {
return err
}
- return ioutil.WriteFile(filepath.Join(dst, rel), data, 0644)
+ return os.WriteFile(filepath.Join(dst, rel), data, 0644)
})
if err != nil {
t.Fatal(err)
@@ -145,17 +144,17 @@
replace golang.org/x/text => %s
`, xTextDir)
- if err := ioutil.WriteFile(filepath.Join(dst, "go.mod"), []byte(goMod), 0644); err != nil {
+ if err := os.WriteFile(filepath.Join(dst, "go.mod"), []byte(goMod), 0644); err != nil {
t.Fatal(err)
}
// Copy in the checksums from the parent module so that we won't
// need to re-fetch them from the checksum database.
- data, err := ioutil.ReadFile(filepath.Join(xTextDir, "go.sum"))
+ data, err := os.ReadFile(filepath.Join(xTextDir, "go.sum"))
if err != nil {
t.Fatal(err)
}
- if err := ioutil.WriteFile(filepath.Join(dst, "go.sum"), data, 0644); err != nil {
+ if err := os.WriteFile(filepath.Join(dst, "go.sum"), data, 0644); err != nil {
t.Fatal(err)
}
@@ -194,17 +193,17 @@
return nil
}
- got, err := ioutil.ReadFile(gotFile)
+ got, err := os.ReadFile(gotFile)
if err != nil {
t.Errorf("failed to read %q", gotFile)
return nil
}
if *genFiles {
- if err := ioutil.WriteFile(wantFile, got, 0644); err != nil {
+ if err := os.WriteFile(wantFile, got, 0644); err != nil {
t.Fatal(err)
}
}
- want, err := ioutil.ReadFile(wantFile)
+ want, err := os.ReadFile(wantFile)
if err != nil {
t.Errorf("failed to read %q", wantFile)
} else {
@@ -242,7 +241,7 @@
if err != nil {
t.Fatal(err)
}
- if err := ioutil.WriteFile(path, data, 0644); err != nil {
+ if err := os.WriteFile(path, data, 0644); err != nil {
t.Fatal(err)
}
}
diff --git a/transform/transform_test.go b/transform/transform_test.go
index 273abfa..62fad2b 100644
--- a/transform/transform_test.go
+++ b/transform/transform_test.go
@@ -8,7 +8,7 @@
"bytes"
"errors"
"fmt"
- "io/ioutil"
+ "io"
"strconv"
"strings"
"testing"
@@ -648,7 +648,7 @@
// exported API. We override them manually.
r.dst = make([]byte, tc.dstSize)
r.src = make([]byte, tc.srcSize)
- got, err := ioutil.ReadAll(r)
+ got, err := io.ReadAll(r)
str := string(got)
if str != tc.wantStr || err != tc.wantErr {
t.Errorf("\ngot %q, %v\nwant %q, %v", str, err, tc.wantStr, tc.wantErr)
diff --git a/unicode/cldr/decode.go b/unicode/cldr/decode.go
index 48f6bd6..1abcb9e 100644
--- a/unicode/cldr/decode.go
+++ b/unicode/cldr/decode.go
@@ -10,7 +10,6 @@
"encoding/xml"
"fmt"
"io"
- "io/ioutil"
"log"
"os"
"path/filepath"
@@ -160,7 +159,7 @@
// DecodeZip loads CLDR data from the zip archive for which r is the source.
func (d *Decoder) DecodeZip(r io.Reader) (cldr *CLDR, err error) {
- buffer, err := ioutil.ReadAll(r)
+ buffer, err := io.ReadAll(r)
if err != nil {
return nil, err
}
diff --git a/unicode/cldr/makexml.go b/unicode/cldr/makexml.go
index 3c1fd26..528f2c4 100644
--- a/unicode/cldr/makexml.go
+++ b/unicode/cldr/makexml.go
@@ -15,7 +15,6 @@
"flag"
"fmt"
"io"
- "io/ioutil"
"log"
"os"
"regexp"
@@ -30,7 +29,7 @@
flag.Parse()
r := gen.OpenCLDRCoreZip()
- buffer, err := ioutil.ReadAll(r)
+ buffer, err := io.ReadAll(r)
if err != nil {
log.Fatal("Could not read zip file")
}
diff --git a/unicode/norm/normalize_test.go b/unicode/norm/normalize_test.go
index 8387d4e..678ca40 100644
--- a/unicode/norm/normalize_test.go
+++ b/unicode/norm/normalize_test.go
@@ -9,7 +9,6 @@
"flag"
"fmt"
"io"
- "io/ioutil"
"log"
"os"
"os/exec"
@@ -927,14 +926,14 @@
func runNM(code string) (string, error) {
// Write the file.
- tmpdir, err := ioutil.TempDir(os.TempDir(), "normalize_test")
+ tmpdir, err := os.MkdirTemp(os.TempDir(), "normalize_test")
if err != nil {
return "", fmt.Errorf("failed to create tmpdir: %v", err)
}
defer os.RemoveAll(tmpdir)
goTool := filepath.Join(runtime.GOROOT(), "bin", "go")
filename := filepath.Join(tmpdir, "main.go")
- if err := ioutil.WriteFile(filename, []byte(code), 0644); err != nil {
+ if err := os.WriteFile(filename, []byte(code), 0644); err != nil {
return "", fmt.Errorf("failed to write main.go: %v", err)
}
outputFile := filepath.Join(tmpdir, "main")
To view, visit change 430815. To unsubscribe, or for help writing mail filters, visit settings.
Gopher Robot (Gerrit)
Sep 19, 2022, 12:55:00 PM9/19/22
to shuang cui, Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Cherry Mui, Meng Zhuo, Ian Lance Taylor, Hyang-Ah Hana Kim, Keith Randall, golang-co...@googlegroups.com
Approvals:
Meng Zhuo: Looks good to me, but someone else must approve; Run TryBots
Ian Lance Taylor: Looks good to me, approved; Run TryBots; Automatically submit change
Gopher Robot: TryBots succeeded
Cherry Mui: Looks good to me, but someone else must approve
Ian Lance Taylor: Run TryBots
all: replace io/ioutil with io and os package
For golang/go#45557
Change-Id: Ia95cb5fca120899b6643639dabe8e8ae99eaf193
GitHub-Last-Rev: 529b29f971f53560b71650dbc92ed33ef94a8c18
GitHub-Pull-Request: golang/debug#16
Reviewed-on: https://go-review.googlesource.com/c/debug/+/430857
Run-TryBot: Ian Lance Taylor <ia...@google.com>
Run-TryBot: Ian Lance Taylor <ia...@golang.org>
TryBot-Result: Gopher Robot <go...@golang.org>
Reviewed-by: Ian Lance Taylor <ia...@google.com>
Reviewed-by: Meng Zhuo <m...@golangcn.org>
Auto-Submit: Ian Lance Taylor <ia...@google.com>
Reviewed-by: Cherry Mui <cher...@google.com>
Run-TryBot: Meng Zhuo <m...@golangcn.org>
---
M dwtest/dwloc_test.go
M internal/gocore/gocore_test.go
2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/dwtest/dwloc_test.go b/dwtest/dwloc_test.go
index a4e85c9..0184c0e 100644
--- a/dwtest/dwloc_test.go
+++ b/dwtest/dwloc_test.go
@@ -28,7 +28,6 @@
import (
"bytes"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -53,12 +52,12 @@
}
cp := func(from, to string) {
var payload []byte
- payload, err := ioutil.ReadFile(from)
+ payload, err := os.ReadFile(from)
if err != nil {
- t.Fatalf("ioutil.ReadFile failed: %v", err)
+ t.Fatalf("os.ReadFile failed: %v", err)
}
- if err = ioutil.WriteFile(to, payload, 0644); err != nil {
- t.Fatalf("ioutil.WriteFile failed: %v", err)
+ if err = os.WriteFile(to, payload, 0644); err != nil {
+ t.Fatalf("os.WriteFile failed: %v", err)
}
}
join := filepath.Join
@@ -109,7 +108,7 @@
// Return value is binary path.
func gobuild(t *testing.T, sourceCode string, pname string) string {
spath := filepath.Join(t.TempDir(), pname+".go")
- if err := ioutil.WriteFile(spath, []byte(sourceCode), 0644); err != nil {
+ if err := os.WriteFile(spath, []byte(sourceCode), 0644); err != nil {
t.Fatalf("write to %s failed: %s", spath, err)
}
epath := filepath.Join(t.TempDir(), pname+".exe")
diff --git a/internal/gocore/gocore_test.go b/internal/gocore/gocore_test.go
index e9a41b8..45ff613 100644
--- a/internal/gocore/gocore_test.go
+++ b/internal/gocore/gocore_test.go
@@ -12,7 +12,6 @@
"errors"
"fmt"
"io"
- "io/ioutil"
"os"
"os/exec"
"path"
@@ -62,7 +61,7 @@
var base string
if strings.HasSuffix(version, ".zip") {
// Make temporary directory.
- dir, err := ioutil.TempDir("", strings.TrimSuffix(version, ".zip")+"_")
+ dir, err := os.MkdirTemp("", strings.TrimSuffix(version, ".zip")+"_")
if err != nil {
t.Fatalf("can't make temp directory: %s", err)
}
@@ -433,7 +432,7 @@
t.Skip("skipping test on android")
}
// Make temporary directory.
- dir, err := ioutil.TempDir("", name+"_")
+ dir, err := os.MkdirTemp("", name+"_")
if err != nil {
t.Fatalf("can't make temp directory: %s", err)
}
To view, visit change 430857. To unsubscribe, or for help writing mail filters, visit settings.
Gopher Robot (Gerrit)
Sep 19, 2022, 1:23:19 PM9/19/22
to shuang cui, Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Cherry Mui, Meng Zhuo, Ian Lance Taylor, golang-co...@googlegroups.com
Approvals:
Ian Lance Taylor: Looks good to me, approved; Run TryBots; Automatically submit change
Cherry Mui: Looks good to me, but someone else must approve
Gopher Robot: TryBots succeeded
all: replace io/ioutil with io and os package
For golang/go#45557
Change-Id: Ib1e5d3116f04adaacb4d6b81898db255b3d5bd04
GitHub-Last-Rev: 6a580196cbdc8703799604a59e474f357e2a98e6
GitHub-Pull-Request: golang/benchmarks#3
Reviewed-on: https://go-review.googlesource.com/c/benchmarks/+/430856
Auto-Submit: Ian Lance Taylor <ia...@google.com>
Reviewed-by: Ian Lance Taylor <ia...@google.com>
TryBot-Result: Gopher Robot <go...@golang.org>
Run-TryBot: Ian Lance Taylor <ia...@google.com>
Reviewed-by: Cherry Mui <cher...@google.com>
---
M cmd/bent/bent.go
M driver/driver_linux.go
M driver/driver_plan9.go
M garbage/nethttp.go
M http/http.go
M json/json.go
M sweet/benchmarks/biogo-igor/igor.go
M sweet/benchmarks/internal/driver/mem_linux.go
M sweet/benchmarks/markdown/main.go
M sweet/cmd/sweet/benchmark.go
M sweet/cmd/sweet/run.go
M sweet/generators/gvisor.go
M sweet/generators/tile38.go
13 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/cmd/bent/bent.go b/cmd/bent/bent.go
index ce7e772..ad75d6c 100644
--- a/cmd/bent/bent.go
+++ b/cmd/bent/bent.go
@@ -15,7 +15,6 @@
"flag"
"fmt"
"io/fs"
- "io/ioutil"
"math/rand"
"os"
"os/exec"
@@ -226,17 +225,17 @@
}
todo := &Todo{}
- blobB, err := ioutil.ReadFile(benchFile)
+ blobB, err := os.ReadFile(benchFile)
if err != nil {
fmt.Printf("There was an error opening or reading file %s: %v\n", benchFile, err)
os.Exit(1)
}
- blobC, err := ioutil.ReadFile(confFile)
+ blobC, err := os.ReadFile(confFile)
if err != nil {
fmt.Printf("There was an error opening or reading file %s: %v\n", confFile, err)
os.Exit(1)
}
- blobS, err := ioutil.ReadFile(suiteFile)
+ blobS, err := os.ReadFile(suiteFile)
if err != nil {
fmt.Printf("There was an error opening or reading file %s: %v\n", suiteFile, err)
os.Exit(1)
@@ -1130,7 +1129,7 @@
copyAsset(configs, "configs", s)
}
- err := ioutil.WriteFile("Dockerfile",
+ err := os.WriteFile("Dockerfile",
[]byte(`
FROM ubuntu
ADD . /
@@ -1172,7 +1171,7 @@
fmt.Printf("Error reading asset %s\n", file)
os.Exit(1)
}
- err = ioutil.WriteFile(file, bytes, 0664)
+ err = os.WriteFile(file, bytes, 0664)
if err != nil {
fmt.Printf("Error writing %s\n", file)
os.Exit(1)
diff --git a/driver/driver_linux.go b/driver/driver_linux.go
index 4012aeb..31395e8 100644
--- a/driver/driver_linux.go
+++ b/driver/driver_linux.go
@@ -11,7 +11,6 @@
"bufio"
"bytes"
"io"
- "io/ioutil"
"log"
"os"
"os/exec"
@@ -105,7 +104,7 @@
}
func getVMPeak() uint64 {
- data, err := ioutil.ReadFile("/proc/self/status")
+ data, err := os.ReadFile("/proc/self/status")
if err != nil {
log.Printf("Failed to read /proc/self/status: %v", err)
return 0
diff --git a/driver/driver_plan9.go b/driver/driver_plan9.go
index 2b58d8a..6f00b14 100644
--- a/driver/driver_plan9.go
+++ b/driver/driver_plan9.go
@@ -7,8 +7,8 @@
import (
"bytes"
"fmt"
- "io/ioutil"
"log"
+ "os"
"os/exec"
"strconv"
"strings"
@@ -72,7 +72,7 @@
}
func procCPUTime() (uint64, error) {
- b, err := ioutil.ReadFile("/dev/cputime")
+ b, err := os.ReadFile("/dev/cputime")
if err != nil {
return 0, err
}
diff --git a/garbage/nethttp.go b/garbage/nethttp.go
index ba7e806..89c50e9 100644
--- a/garbage/nethttp.go
+++ b/garbage/nethttp.go
@@ -22,7 +22,7 @@
// // handle error
// }
// defer resp.Body.Close()
-// body, err := ioutil.ReadAll(resp.Body)
+// body, err := io.ReadAll(resp.Body)
// // ...
//
// For control over HTTP client headers, redirect policy, and other
@@ -90,7 +90,6 @@
"errors"
"fmt"
"io"
- "io/ioutil"
"log"
"mime"
"mime/multipart"
@@ -469,7 +468,7 @@
// No need to check for errors: if it fails, Transport won't reuse it anyway.
const maxBodySlurpSize = 2 << 10
if resp.ContentLength == -1 || resp.ContentLength <= maxBodySlurpSize {
- io.CopyN(ioutil.Discard, resp.Body, maxBodySlurpSize)
+ io.CopyN(io.Discard, resp.Body, maxBodySlurpSize)
}
resp.Body.Close()
if urlStr = resp.Header.Get("Location"); urlStr == "" {
@@ -2495,7 +2494,7 @@
}
rc, ok := body.(io.ReadCloser)
if !ok && body != nil {
- rc = ioutil.NopCloser(body)
+ rc = io.NopCloser(body)
}
req := &Request{
Method: method,
@@ -2744,7 +2743,7 @@
maxFormSize = int64(10 << 20)
reader = io.LimitReader(r.Body, maxFormSize+1)
}
- b, e := ioutil.ReadAll(reader)
+ b, e := io.ReadAll(reader)
if e != nil {
if err == nil {
err = e
@@ -4011,7 +4010,7 @@
}
if discard {
- _, err := io.CopyN(ioutil.Discard, w.req.Body, maxPostHandlerReadBytes+1)
+ _, err := io.CopyN(io.Discard, w.req.Body, maxPostHandlerReadBytes+1)
switch err {
case nil:
@@ -5190,7 +5189,7 @@
if r.ContentLength != 0 {
mb := MaxBytesReader(w, r.Body, 4<<10)
- io.Copy(ioutil.Discard, mb)
+ io.Copy(io.Discard, mb)
}
}
@@ -5207,7 +5206,7 @@
io.Closer
}{
eofReaderWithWriteTo{},
- ioutil.NopCloser(nil),
+ io.NopCloser(nil),
}
// Verify that an io.Copy from an eofReader won't require a buffer.
@@ -5813,7 +5812,7 @@
return err
}
var nextra int64
- nextra, err = io.Copy(ioutil.Discard, t.Body)
+ nextra, err = io.Copy(io.Discard, t.Body)
ncopy += nextra
}
if err != nil {
@@ -6301,7 +6300,7 @@
} else {
var n int64
- n, err = io.CopyN(ioutil.Discard, bodyLocked{b}, maxPostHandlerReadBytes)
+ n, err = io.CopyN(io.Discard, bodyLocked{b}, maxPostHandlerReadBytes)
if err == io.EOF {
err = nil
}
@@ -6311,7 +6310,7 @@
}
default:
- _, err = io.Copy(ioutil.Discard, bodyLocked{b})
+ _, err = io.Copy(io.Discard, bodyLocked{b})
}
b.closed = true
return err
diff --git a/http/http.go b/http/http.go
index 1549281..898d400 100644
--- a/http/http.go
+++ b/http/http.go
@@ -7,7 +7,7 @@
import (
"fmt"
- "io/ioutil"
+ "io"
"log"
"net"
"net/http"
@@ -51,7 +51,7 @@
return false
}
defer res.Body.Close()
- b, err := ioutil.ReadAll(res.Body)
+ b, err := io.ReadAll(res.Body)
if err != nil {
log.Fatalf("ReadAll: %v", err)
}
diff --git a/json/json.go b/json/json.go
index 58269bd..4fc5da1 100644
--- a/json/json.go
+++ b/json/json.go
@@ -12,7 +12,6 @@
"encoding/base64"
"encoding/json"
"io"
- "io/ioutil"
"golang.org/x/benchmarks/driver"
)
@@ -47,7 +46,7 @@
r = bytes.NewReader(bytes.Replace(jsonbz2_base64, []byte{'\n'}, nil, -1))
r = base64.NewDecoder(base64.StdEncoding, r)
r = bzip2.NewReader(r)
- b, err := ioutil.ReadAll(r)
+ b, err := io.ReadAll(r)
if err != nil {
panic(err)
}
diff --git a/sweet/benchmarks/biogo-igor/igor.go b/sweet/benchmarks/biogo-igor/igor.go
index 1e787f1..8f1a270 100644
--- a/sweet/benchmarks/biogo-igor/igor.go
+++ b/sweet/benchmarks/biogo-igor/igor.go
@@ -10,8 +10,8 @@
"bytes"
"flag"
"fmt"
- "io/ioutil"
"log"
+ "os"
"runtime"
"golang.org/x/benchmarks/sweet/benchmarks/internal/driver"
@@ -41,7 +41,7 @@
log.Fatal("error: input GFF file required")
}
- data, err := ioutil.ReadFile(flag.Arg(0))
+ data, err := os.ReadFile(flag.Arg(0))
if err != nil {
log.Fatalf("error: %v", err)
}
diff --git a/sweet/benchmarks/internal/driver/mem_linux.go b/sweet/benchmarks/internal/driver/mem_linux.go
index 9243aa0..3c3f71f 100644
--- a/sweet/benchmarks/internal/driver/mem_linux.go
+++ b/sweet/benchmarks/internal/driver/mem_linux.go
@@ -6,7 +6,6 @@
import (
"fmt"
- "io/ioutil"
"os"
"regexp"
"strconv"
@@ -20,7 +19,7 @@
)
func readStat(pid int, r *regexp.Regexp) (uint64, error) {
- b, err := ioutil.ReadFile(fmt.Sprintf("/proc/%d/status", pid))
+ b, err := os.ReadFile(fmt.Sprintf("/proc/%d/status", pid))
if err != nil {
return 0, err
}
diff --git a/sweet/benchmarks/markdown/main.go b/sweet/benchmarks/markdown/main.go
index 67bfc73..76ffedb 100644
--- a/sweet/benchmarks/markdown/main.go
+++ b/sweet/benchmarks/markdown/main.go
@@ -8,7 +8,6 @@
"bytes"
"flag"
"fmt"
- "io/ioutil"
"os"
"path/filepath"
@@ -18,7 +17,7 @@
)
func run(mddir string) error {
- files, err := ioutil.ReadDir(mddir)
+ files, err := os.ReadDir(mddir)
if err != nil {
return err
}
@@ -26,7 +25,7 @@
contents := make([][]byte, 0, len(files))
for _, file := range files {
if !file.IsDir() && filepath.Ext(file.Name()) == ".md" {
- content, err := ioutil.ReadFile(filepath.Join(mddir, file.Name()))
+ content, err := os.ReadFile(filepath.Join(mddir, file.Name()))
if err != nil {
return err
}
diff --git a/sweet/cmd/sweet/benchmark.go b/sweet/cmd/sweet/benchmark.go
index a2977a4..a39d2c2 100644
--- a/sweet/cmd/sweet/benchmark.go
+++ b/sweet/cmd/sweet/benchmark.go
@@ -8,7 +8,6 @@
"errors"
"fmt"
"io/fs"
- "io/ioutil"
"os"
"path/filepath"
"runtime"
@@ -157,7 +156,7 @@
func rmDirContents(dir string) error {
log.CommandPrintf("rm -rf %s/*", dir)
- fs, err := ioutil.ReadDir(dir)
+ fs, err := os.ReadDir(dir)
if err != nil {
return err
}
diff --git a/sweet/cmd/sweet/run.go b/sweet/cmd/sweet/run.go
index 111d498..75f75aa 100644
--- a/sweet/cmd/sweet/run.go
+++ b/sweet/cmd/sweet/run.go
@@ -10,7 +10,6 @@
"fmt"
"io"
"io/fs"
- "io/ioutil"
"os"
"path/filepath"
"sort"
@@ -157,7 +156,7 @@
var err error
if c.workDir == "" {
// Create a temporary work tree for running the benchmarks.
- c.workDir, err = ioutil.TempDir("", "gosweet")
+ c.workDir, err = os.MkdirTemp("", "gosweet")
if err != nil {
return fmt.Errorf("creating work root: %w", err)
}
@@ -238,7 +237,7 @@
configDir := filepath.Dir(configFile)
// Read and parse the configuration file.
- b, err := ioutil.ReadFile(configFile)
+ b, err := os.ReadFile(configFile)
if err != nil {
return fmt.Errorf("failed to read %q: %v", configFile, err)
}
diff --git a/sweet/generators/gvisor.go b/sweet/generators/gvisor.go
index ed0b7db..e378151 100644
--- a/sweet/generators/gvisor.go
+++ b/sweet/generators/gvisor.go
@@ -9,7 +9,6 @@
"encoding/json"
"errors"
"fmt"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -67,7 +66,7 @@
// copy of runsc. Get and build it from the harness.
//
// Create a temporary directory where we can put the gVisor source.
- tmpDir, err := ioutil.TempDir("", "gvisor-gen")
+ tmpDir, err := os.MkdirTemp("", "gvisor-gen")
if err != nil {
return err
}
diff --git a/sweet/generators/tile38.go b/sweet/generators/tile38.go
index 21a0e14..b91c4f7 100644
--- a/sweet/generators/tile38.go
+++ b/sweet/generators/tile38.go
@@ -9,7 +9,6 @@
"bytes"
"fmt"
"io"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -68,7 +67,7 @@
// Create a temporary directory where we can put the Tile38
// source and build it.
- tmpDir, err := ioutil.TempDir("", "tile38-gen")
+ tmpDir, err := os.MkdirTemp("", "tile38-gen")
if err != nil {
return err
}
@@ -292,7 +291,7 @@
// storeGeoJSON writes an entire GeoJSON object (which may contain many polygons)
// to a Tile38 database.
func storeGeoJSON(c redis.Conn, jsonFile string) error {
- b, err := ioutil.ReadFile(jsonFile)
+ b, err := os.ReadFile(jsonFile)
if err != nil {
return err
}
To view, visit change 430856. To unsubscribe, or for help writing mail filters, visit settings.
Gopher Robot (Gerrit)
Sep 19, 2022, 1:36:12 PM9/19/22
to shuang cui, Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Cherry Mui, Meng Zhuo, Ian Lance Taylor, Roland Shoemaker, Filippo Valsorda, Brad Fitzpatrick, Adam Langley, golang-co...@googlegroups.com
Approvals:
Ian Lance Taylor: Looks good to me, approved; Run TryBots; Automatically submit change
Gopher Robot: TryBots succeeded
Cherry Mui: Looks good to me, but someone else must approve
Meng Zhuo: Looks good to me, but someone else must approve
all: replace io/ioutil with io and os package
For golang/go#45557
Change-Id: I447530cc66896aef7a8d528ccb8d095b80e3cf47
GitHub-Last-Rev: 5f385ff46487ac318bd1147cdbbd26bb0ffd0426
GitHub-Pull-Request: golang/crypto#230
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/430797
Auto-Submit: Ian Lance Taylor <ia...@google.com>
Reviewed-by: Ian Lance Taylor <ia...@google.com>
Reviewed-by: Meng Zhuo <m...@golangcn.org>
Run-TryBot: Ian Lance Taylor <ia...@google.com>
TryBot-Result: Gopher Robot <go...@golang.org>
Reviewed-by: Cherry Mui <cher...@google.com>
---
M acme/autocert/autocert_test.go
M acme/autocert/cache.go
M acme/autocert/cache_test.go
M acme/http.go
M acme/http_test.go
M acme/rfc8555.go
M acme/rfc8555_test.go
M internal/wycheproof/wycheproof_test.go
M openpgp/armor/armor_test.go
M openpgp/packet/compressed_test.go
M openpgp/packet/opaque.go
M openpgp/packet/packet_test.go
M openpgp/packet/private_key.go
M openpgp/packet/signature_v3_test.go
M openpgp/packet/symmetric_key_encrypted_test.go
M openpgp/packet/symmetrically_encrypted.go
M openpgp/packet/symmetrically_encrypted_test.go
M openpgp/packet/userattribute.go
M openpgp/packet/userid.go
M openpgp/read_test.go
M openpgp/write.go
M openpgp/write_test.go
M ssh/cipher.go
M ssh/example_test.go
M ssh/mux_test.go
M ssh/session.go
M ssh/session_test.go
M ssh/test/dial_unix_test.go
M ssh/test/forward_unix_test.go
M ssh/test/test_unix_test.go
30 files changed, 80 insertions(+), 83 deletions(-)
diff --git a/acme/autocert/autocert_test.go b/acme/autocert/autocert_test.go
index ab7504a..59f6e0e 100644
--- a/acme/autocert/autocert_test.go
+++ b/acme/autocert/autocert_test.go
@@ -17,7 +17,7 @@
"crypto/x509/pkix"
"encoding/asn1"
"fmt"
- "io/ioutil"
+ "io"
"math/big"
"net/http"
"net/http/httptest"
@@ -941,7 +941,7 @@
t.Fatal(err)
}
defer res.Body.Close()
- b, err := ioutil.ReadAll(res.Body)
+ b, err := io.ReadAll(res.Body)
if err != nil {
t.Fatal(err)
}
@@ -995,7 +995,7 @@
t.Fatal(err)
}
defer res.Body.Close()
- b, err := ioutil.ReadAll(res.Body)
+ b, err := io.ReadAll(res.Body)
if err != nil {
t.Fatal(err)
}
diff --git a/acme/autocert/cache.go b/acme/autocert/cache.go
index 3156a08..758ab12 100644
--- a/acme/autocert/cache.go
+++ b/acme/autocert/cache.go
@@ -7,7 +7,6 @@
import (
"context"
"errors"
- "io/ioutil"
"os"
"path/filepath"
)
@@ -48,7 +47,7 @@
done = make(chan struct{})
)
go func() {
- data, err = ioutil.ReadFile(name)
+ data, err = os.ReadFile(name)
close(done)
}()
select {
@@ -119,7 +118,7 @@
// writeTempFile writes b to a temporary file, closes the file and returns its path.
func (d DirCache) writeTempFile(prefix string, b []byte) (name string, reterr error) {
// TempFile uses 0600 permissions
- f, err := ioutil.TempFile(string(d), prefix)
+ f, err := os.CreateTemp(string(d), prefix)
if err != nil {
return "", err
}
diff --git a/acme/autocert/cache_test.go b/acme/autocert/cache_test.go
index 4d0b162..582e6b0 100644
--- a/acme/autocert/cache_test.go
+++ b/acme/autocert/cache_test.go
@@ -6,7 +6,6 @@
import (
"context"
- "io/ioutil"
"os"
"path/filepath"
"reflect"
@@ -17,7 +16,7 @@
var _ Cache = DirCache("/")
func TestDirCache(t *testing.T) {
- dir, err := ioutil.TempDir("", "autocert")
+ dir, err := os.MkdirTemp("", "autocert")
if err != nil {
t.Fatal(err)
}
diff --git a/acme/http.go b/acme/http.go
index 2b4c1a1..2617b00 100644
--- a/acme/http.go
+++ b/acme/http.go
@@ -12,7 +12,7 @@
"encoding/json"
"errors"
"fmt"
- "io/ioutil"
+ "io"
"math/big"
"net/http"
"strconv"
@@ -310,7 +310,7 @@
func responseError(resp *http.Response) error {
// don't care if ReadAll returns an error:
// json.Unmarshal will fail in that case anyway
- b, _ := ioutil.ReadAll(resp.Body)
+ b, _ := io.ReadAll(resp.Body)
e := &wireError{Status: resp.StatusCode}
if err := json.Unmarshal(b, e); err != nil {
// this is not a regular error response:
diff --git a/acme/http_test.go b/acme/http_test.go
index f35e04a..d124e4e 100644
--- a/acme/http_test.go
+++ b/acme/http_test.go
@@ -7,7 +7,7 @@
import (
"context"
"fmt"
- "io/ioutil"
+ "io"
"net/http"
"net/http/httptest"
"reflect"
@@ -54,7 +54,7 @@
res := &http.Response{
StatusCode: 400,
Status: "400 Bad Request",
- Body: ioutil.NopCloser(strings.NewReader(s)),
+ Body: io.NopCloser(strings.NewReader(s)),
Header: http.Header{"X-Foo": {"bar"}},
}
err := responseError(res)
diff --git a/acme/rfc8555.go b/acme/rfc8555.go
index 940e70b..ee24dfd 100644
--- a/acme/rfc8555.go
+++ b/acme/rfc8555.go
@@ -13,7 +13,6 @@
"errors"
"fmt"
"io"
- "io/ioutil"
"net/http"
"time"
)
@@ -390,7 +389,7 @@
// Get all the bytes up to a sane maximum.
// Account very roughly for base64 overhead.
const max = maxCertChainSize + maxCertChainSize/33
- b, err := ioutil.ReadAll(io.LimitReader(res.Body, max+1))
+ b, err := io.ReadAll(io.LimitReader(res.Body, max+1))
if err != nil {
return nil, fmt.Errorf("acme: fetch cert response stream: %v", err)
}
@@ -469,7 +468,7 @@
// We don't need the body but we need to discard it so we don't end up
// preventing keep-alive
- if _, err := io.Copy(ioutil.Discard, res.Body); err != nil {
+ if _, err := io.Copy(io.Discard, res.Body); err != nil {
return nil, fmt.Errorf("acme: cert alternates response stream: %v", err)
}
alts := linkHeader(res.Header, "alternate")
diff --git a/acme/rfc8555_test.go b/acme/rfc8555_test.go
index 6ea77df..4ab98f6 100644
--- a/acme/rfc8555_test.go
+++ b/acme/rfc8555_test.go
@@ -17,7 +17,7 @@
"encoding/pem"
"errors"
"fmt"
- "io/ioutil"
+ "io"
"math/big"
"net/http"
"net/http/httptest"
@@ -148,7 +148,7 @@
w.Header().Set("Location", "/account-1")
w.Write([]byte(`{"status":"valid"}`))
case "/post":
- b, _ := ioutil.ReadAll(r.Body) // check err later in decodeJWSxxx
+ b, _ := io.ReadAll(r.Body) // check err later in decodeJWSxxx
head, err := decodeJWSHead(bytes.NewReader(b))
if err != nil {
t.Errorf("decodeJWSHead: %v", err)
@@ -194,7 +194,7 @@
t.Fatal(err)
}
defer res.Body.Close()
- b, _ := ioutil.ReadAll(res.Body) // don't care about err - just checking b
+ b, _ := io.ReadAll(res.Body) // don't care about err - just checking b
if string(b) != "pong" {
t.Errorf("res.Body = %q; want pong", b)
}
@@ -297,7 +297,7 @@
"orders": %q
}`, email, s.url("/accounts/1/orders"))
- b, _ := ioutil.ReadAll(r.Body) // check err later in decodeJWSxxx
+ b, _ := io.ReadAll(r.Body) // check err later in decodeJWSxxx
head, err := decodeJWSHead(bytes.NewReader(b))
if err != nil {
t.Errorf("decodeJWSHead: %v", err)
@@ -528,7 +528,7 @@
w.WriteHeader(http.StatusOK)
w.Write([]byte(`{"status": "valid"}`))
- b, _ := ioutil.ReadAll(r.Body) // check err later in decodeJWSxxx
+ b, _ := io.ReadAll(r.Body) // check err later in decodeJWSxxx
head, err := decodeJWSHead(bytes.NewReader(b))
if err != nil {
t.Errorf("decodeJWSHead: %v", err)
@@ -668,7 +668,7 @@
Orders: s.url("/accounts/1/orders"),
})
- b, _ := ioutil.ReadAll(r.Body) // check err later in decodeJWSxxx
+ b, _ := io.ReadAll(r.Body) // check err later in decodeJWSxxx
head, err := decodeJWSHead(bytes.NewReader(b))
if err != nil {
t.Errorf("decodeJWSHead: %v", err)
@@ -700,7 +700,7 @@
})
}
var req account
- b, _ := ioutil.ReadAll(r.Body) // check err later in decodeJWSxxx
+ b, _ := io.ReadAll(r.Body) // check err later in decodeJWSxxx
head, err := decodeJWSHead(bytes.NewReader(b))
if err != nil {
t.Errorf("decodeJWSHead: %v", err)
diff --git a/internal/wycheproof/wycheproof_test.go b/internal/wycheproof/wycheproof_test.go
index 69c6117..fcae97c 100644
--- a/internal/wycheproof/wycheproof_test.go
+++ b/internal/wycheproof/wycheproof_test.go
@@ -12,7 +12,6 @@
"encoding/hex"
"encoding/json"
"fmt"
- "io/ioutil"
"log"
"os"
"os/exec"
@@ -62,7 +61,7 @@
}
func readTestVector(t *testing.T, f string, dest interface{}) {
- b, err := ioutil.ReadFile(filepath.Join(wycheproofTestVectorsDir, f))
+ b, err := os.ReadFile(filepath.Join(wycheproofTestVectorsDir, f))
if err != nil {
t.Fatalf("failed to read json file: %v", err)
}
diff --git a/openpgp/armor/armor_test.go b/openpgp/armor/armor_test.go
index 9334e94..c05af95 100644
--- a/openpgp/armor/armor_test.go
+++ b/openpgp/armor/armor_test.go
@@ -7,7 +7,7 @@
import (
"bytes"
"hash/adler32"
- "io/ioutil"
+ "io"
"testing"
)
@@ -29,7 +29,7 @@
t.Errorf("result.Header: got:%#v", result.Header)
}
- contents, err := ioutil.ReadAll(result.Body)
+ contents, err := io.ReadAll(result.Body)
if err != nil {
t.Error(err)
}
diff --git a/openpgp/packet/compressed_test.go b/openpgp/packet/compressed_test.go
index cb2d70b..37fcc0b 100644
--- a/openpgp/packet/compressed_test.go
+++ b/openpgp/packet/compressed_test.go
@@ -8,7 +8,6 @@
"bytes"
"encoding/hex"
"io"
- "io/ioutil"
"testing"
)
@@ -25,7 +24,7 @@
return
}
- contents, err := ioutil.ReadAll(c.Body)
+ contents, err := io.ReadAll(c.Body)
if err != nil && err != io.EOF {
t.Error(err)
return
diff --git a/openpgp/packet/opaque.go b/openpgp/packet/opaque.go
index 456d807..3984477 100644
--- a/openpgp/packet/opaque.go
+++ b/openpgp/packet/opaque.go
@@ -7,7 +7,6 @@
import (
"bytes"
"io"
- "io/ioutil"
"golang.org/x/crypto/openpgp/errors"
)
@@ -26,7 +25,7 @@
}
func (op *OpaquePacket) parse(r io.Reader) (err error) {
- op.Contents, err = ioutil.ReadAll(r)
+ op.Contents, err = io.ReadAll(r)
return
}
diff --git a/openpgp/packet/packet_test.go b/openpgp/packet/packet_test.go
index 63a8387..c8fc4e5 100644
--- a/openpgp/packet/packet_test.go
+++ b/openpgp/packet/packet_test.go
@@ -10,7 +10,6 @@
"fmt"
"golang.org/x/crypto/openpgp/errors"
"io"
- "io/ioutil"
"testing"
)
@@ -100,7 +99,7 @@
func TestPartialLengthReader(t *testing.T) {
for i, test := range partialLengthReaderTests {
r := &partialLengthReader{readerFromHex(test.hexInput), 0, true}
- out, err := ioutil.ReadAll(r)
+ out, err := io.ReadAll(r)
if test.err != nil {
if err != test.err {
t.Errorf("%d: expected different error got:%s want:%s", i, err, test.err)
@@ -172,7 +171,7 @@
continue
}
- body, err := ioutil.ReadAll(contents)
+ body, err := io.ReadAll(contents)
if err != nil {
if !test.unexpectedEOF || err != io.ErrUnexpectedEOF {
t.Errorf("%d: unexpected error from contents: %s", i, err)
diff --git a/openpgp/packet/private_key.go b/openpgp/packet/private_key.go
index 81abb7c..192aac3 100644
--- a/openpgp/packet/private_key.go
+++ b/openpgp/packet/private_key.go
@@ -13,7 +13,6 @@
"crypto/rsa"
"crypto/sha1"
"io"
- "io/ioutil"
"math/big"
"strconv"
"time"
@@ -133,7 +132,7 @@
}
}
- pk.encryptedData, err = ioutil.ReadAll(r)
+ pk.encryptedData, err = io.ReadAll(r)
if err != nil {
return
}
diff --git a/openpgp/packet/signature_v3_test.go b/openpgp/packet/signature_v3_test.go
index 73b46ae..abb2d8c 100644
--- a/openpgp/packet/signature_v3_test.go
+++ b/openpgp/packet/signature_v3_test.go
@@ -9,7 +9,6 @@
"crypto"
"encoding/hex"
"io"
- "io/ioutil"
"testing"
"golang.org/x/crypto/openpgp/armor"
@@ -45,7 +44,7 @@
t.Errorf("error reserializing: %s", err)
return
}
- expected, err := ioutil.ReadAll(v3KeyReader(t))
+ expected, err := io.ReadAll(v3KeyReader(t))
if err != nil {
t.Error(err)
return
diff --git a/openpgp/packet/symmetric_key_encrypted_test.go b/openpgp/packet/symmetric_key_encrypted_test.go
index e1d52c1..5471d77 100644
--- a/openpgp/packet/symmetric_key_encrypted_test.go
+++ b/openpgp/packet/symmetric_key_encrypted_test.go
@@ -8,7 +8,6 @@
"bytes"
"encoding/hex"
"io"
- "io/ioutil"
"testing"
)
@@ -46,7 +45,7 @@
return
}
- contents, err := ioutil.ReadAll(r)
+ contents, err := io.ReadAll(r)
if err != nil && err != io.EOF {
t.Error(err)
return
diff --git a/openpgp/packet/symmetrically_encrypted.go b/openpgp/packet/symmetrically_encrypted.go
index 6126030..1a1a629 100644
--- a/openpgp/packet/symmetrically_encrypted.go
+++ b/openpgp/packet/symmetrically_encrypted.go
@@ -236,7 +236,7 @@
return w.w.Close()
}
-// noOpCloser is like an ioutil.NopCloser, but for an io.Writer.
+// noOpCloser is like an io.NopCloser, but for an io.Writer.
type noOpCloser struct {
w io.Writer
}
diff --git a/openpgp/packet/symmetrically_encrypted_test.go b/openpgp/packet/symmetrically_encrypted_test.go
index c5c00f7..4c47c7b 100644
--- a/openpgp/packet/symmetrically_encrypted_test.go
+++ b/openpgp/packet/symmetrically_encrypted_test.go
@@ -10,7 +10,6 @@
"encoding/hex"
"golang.org/x/crypto/openpgp/errors"
"io"
- "io/ioutil"
"testing"
)
@@ -42,7 +41,7 @@
for stride := 1; stride < len(mdcPlaintext)/2; stride++ {
r := &testReader{data: mdcPlaintext, stride: stride}
mdcReader := &seMDCReader{in: r, h: sha1.New()}
- body, err := ioutil.ReadAll(mdcReader)
+ body, err := io.ReadAll(mdcReader)
if err != nil {
t.Errorf("stride: %d, error: %s", stride, err)
continue
@@ -62,7 +61,7 @@
r := &testReader{data: mdcPlaintext, stride: 2}
mdcReader := &seMDCReader{in: r, h: sha1.New()}
- _, err := ioutil.ReadAll(mdcReader)
+ _, err := io.ReadAll(mdcReader)
if err != nil {
t.Errorf("corruption test, error: %s", err)
return
diff --git a/openpgp/packet/userattribute.go b/openpgp/packet/userattribute.go
index d19ffbc..ff7ef53 100644
--- a/openpgp/packet/userattribute.go
+++ b/openpgp/packet/userattribute.go
@@ -9,7 +9,6 @@
"image"
"image/jpeg"
"io"
- "io/ioutil"
)
const UserAttrImageSubpacket = 1
@@ -56,7 +55,7 @@
func (uat *UserAttribute) parse(r io.Reader) (err error) {
// RFC 4880, section 5.13
- b, err := ioutil.ReadAll(r)
+ b, err := io.ReadAll(r)
if err != nil {
return
}
diff --git a/openpgp/packet/userid.go b/openpgp/packet/userid.go
index d6bea7d..359a462 100644
--- a/openpgp/packet/userid.go
+++ b/openpgp/packet/userid.go
@@ -6,7 +6,6 @@
import (
"io"
- "io/ioutil"
"strings"
)
@@ -66,7 +65,7 @@
func (uid *UserId) parse(r io.Reader) (err error) {
// RFC 4880, section 5.11
- b, err := ioutil.ReadAll(r)
+ b, err := io.ReadAll(r)
if err != nil {
return
}
diff --git a/openpgp/read_test.go b/openpgp/read_test.go
index f5bba30..6bbfaf1 100644
--- a/openpgp/read_test.go
+++ b/openpgp/read_test.go
@@ -9,7 +9,6 @@
_ "crypto/sha512"
"encoding/hex"
"io"
- "io/ioutil"
"strings"
"testing"
@@ -128,7 +127,7 @@
t.Errorf("bad MessageDetails: %#v", md)
}
- contents, err := ioutil.ReadAll(md.UnverifiedBody)
+ contents, err := io.ReadAll(md.UnverifiedBody)
if err != nil {
t.Errorf("error reading UnverifiedBody: %s", err)
}
@@ -221,7 +220,7 @@
t.Errorf("#%d: bad MessageDetails: %#v", i, md)
}
- contents, err := ioutil.ReadAll(md.UnverifiedBody)
+ contents, err := io.ReadAll(md.UnverifiedBody)
if err != nil {
t.Errorf("#%d: error reading UnverifiedBody: %s", i, err)
}
@@ -245,7 +244,7 @@
return
}
- contents, err := ioutil.ReadAll(md.UnverifiedBody)
+ contents, err := io.ReadAll(md.UnverifiedBody)
if err != nil {
t.Errorf("error reading UnverifiedBody: %s", err)
}
@@ -280,7 +279,7 @@
return
}
- contents, err := ioutil.ReadAll(md.UnverifiedBody)
+ contents, err := io.ReadAll(md.UnverifiedBody)
if err != nil {
t.Errorf("ReadAll: %s", err)
}
@@ -454,7 +453,7 @@
return
}
- _, err = ioutil.ReadAll(md.UnverifiedBody)
+ _, err = io.ReadAll(md.UnverifiedBody)
if err != nil {
t.Error(err)
return
diff --git a/openpgp/write.go b/openpgp/write.go
index 4ee7178..b89d48b 100644
--- a/openpgp/write.go
+++ b/openpgp/write.go
@@ -402,7 +402,7 @@
return s.encryptedData.Close()
}
-// noOpCloser is like an ioutil.NopCloser, but for an io.Writer.
+// noOpCloser is like an io.NopCloser, but for an io.Writer.
// TODO: we have two of these in OpenPGP packages alone. This probably needs
// to be promoted somewhere more common.
type noOpCloser struct {
diff --git a/openpgp/write_test.go b/openpgp/write_test.go
index cbc8f4d..8b68678 100644
--- a/openpgp/write_test.go
+++ b/openpgp/write_test.go
@@ -7,7 +7,6 @@
import (
"bytes"
"io"
- "io/ioutil"
"testing"
"time"
@@ -245,7 +244,7 @@
}
}
- plaintext, err := ioutil.ReadAll(md.UnverifiedBody)
+ plaintext, err := io.ReadAll(md.UnverifiedBody)
if err != nil {
t.Errorf("#%d: error reading encrypted contents: %s", i, err)
continue
@@ -342,7 +341,7 @@
t.Errorf("#%d: failed to find the signing Entity", i)
}
- plaintext, err := ioutil.ReadAll(md.UnverifiedBody)
+ plaintext, err := io.ReadAll(md.UnverifiedBody)
if err != nil {
t.Errorf("#%d: error reading contents: %v", i, err)
continue
diff --git a/ssh/cipher.go b/ssh/cipher.go
index 770e8a6..c3062cf 100644
--- a/ssh/cipher.go
+++ b/ssh/cipher.go
@@ -15,7 +15,6 @@
"fmt"
"hash"
"io"
- "io/ioutil"
"golang.org/x/crypto/chacha20"
"golang.org/x/crypto/internal/poly1305"
@@ -497,7 +496,7 @@
// data, to make distinguishing between
// failing MAC and failing length check more
// difficult.
- io.CopyN(ioutil.Discard, r, int64(c.oracleCamouflage))
+ io.CopyN(io.Discard, r, int64(c.oracleCamouflage))
}
}
return p, err
diff --git a/ssh/example_test.go b/ssh/example_test.go
index 8a0aaef..bee6796 100644
--- a/ssh/example_test.go
+++ b/ssh/example_test.go
@@ -8,7 +8,6 @@
"bufio"
"bytes"
"fmt"
- "io/ioutil"
"log"
"net"
"net/http"
@@ -24,7 +23,7 @@
// Public key authentication is done by comparing
// the public key of a received connection
// with the entries in the authorized_keys file.
- authorizedKeysBytes, err := ioutil.ReadFile("authorized_keys")
+ authorizedKeysBytes, err := os.ReadFile("authorized_keys")
if err != nil {
log.Fatalf("Failed to load authorized_keys, err: %v", err)
}
@@ -67,7 +66,7 @@
},
}
- privateBytes, err := ioutil.ReadFile("id_rsa")
+ privateBytes, err := os.ReadFile("id_rsa")
if err != nil {
log.Fatal("Failed to load private key: ", err)
}
@@ -225,7 +224,7 @@
//
// If you have an encrypted private key, the crypto/x509 package
// can be used to decrypt it.
- key, err := ioutil.ReadFile("/home/user/.ssh/id_rsa")
+ key, err := os.ReadFile("/home/user/.ssh/id_rsa")
if err != nil {
log.Fatalf("unable to read private key: %v", err)
}
diff --git a/ssh/mux_test.go b/ssh/mux_test.go
index 0b6b74d..393017c 100644
--- a/ssh/mux_test.go
+++ b/ssh/mux_test.go
@@ -6,7 +6,6 @@
import (
"io"
- "io/ioutil"
"sync"
"testing"
"time"
@@ -73,14 +72,14 @@
rd.Add(2)
go func() {
- c, err := ioutil.ReadAll(reader)
+ c, err := io.ReadAll(reader)
if string(c) != magic {
t.Fatalf("stdout read got %q, want %q (error %s)", c, magic, err)
}
rd.Done()
}()
go func() {
- c, err := ioutil.ReadAll(reader.Stderr())
+ c, err := io.ReadAll(reader.Stderr())
if string(c) != magic {
t.Fatalf("stderr read got %q, want %q (error %s)", c, magic, err)
}
@@ -670,7 +669,7 @@
}()
want := "helloworld"
- c, _ := ioutil.ReadAll(b)
+ c, _ := io.ReadAll(b)
if string(c) != want {
t.Errorf("got %q want %q", c, want)
}
diff --git a/ssh/session.go b/ssh/session.go
index eca31a2..acef622 100644
--- a/ssh/session.go
+++ b/ssh/session.go
@@ -13,7 +13,6 @@
"errors"
"fmt"
"io"
- "io/ioutil"
"sync"
)
@@ -124,7 +123,7 @@
// output and error.
//
// If either is nil, Run connects the corresponding file
- // descriptor to an instance of ioutil.Discard. There is a
+ // descriptor to an instance of io.Discard. There is a
// fixed amount of buffering that is shared for the two streams.
// If either blocks it may eventually cause the remote
// command to block.
@@ -506,7 +505,7 @@
return
}
if s.Stdout == nil {
- s.Stdout = ioutil.Discard
+ s.Stdout = io.Discard
}
s.copyFuncs = append(s.copyFuncs, func() error {
_, err := io.Copy(s.Stdout, s.ch)
@@ -519,7 +518,7 @@
return
}
if s.Stderr == nil {
- s.Stderr = ioutil.Discard
+ s.Stderr = io.Discard
}
s.copyFuncs = append(s.copyFuncs, func() error {
_, err := io.Copy(s.Stderr, s.ch.Stderr())
diff --git a/ssh/session_test.go b/ssh/session_test.go
index a4e1a59..2568a88 100644
--- a/ssh/session_test.go
+++ b/ssh/session_test.go
@@ -11,7 +11,6 @@
crypto_rand "crypto/rand"
"errors"
"io"
- "io/ioutil"
"math/rand"
"net"
"testing"
@@ -531,7 +530,7 @@
func discardHandler(ch Channel, t *testing.T) {
defer ch.Close()
- io.Copy(ioutil.Discard, ch)
+ io.Copy(io.Discard, ch)
}
func echoHandler(ch Channel, in <-chan *Request, t *testing.T) {
@@ -606,7 +605,7 @@
}
stdin.Close()
- res, err := ioutil.ReadAll(stdout)
+ res, err := io.ReadAll(stdout)
if err != nil {
t.Fatalf("Read failed: %v", err)
}
@@ -618,7 +617,7 @@
func simpleEchoHandler(ch Channel, in <-chan *Request, t *testing.T) {
defer ch.Close()
- data, err := ioutil.ReadAll(ch)
+ data, err := io.ReadAll(ch)
if err != nil {
t.Errorf("handler read error: %v", err)
}
diff --git a/ssh/test/dial_unix_test.go b/ssh/test/dial_unix_test.go
index 15c34d9..2dca0e6 100644
--- a/ssh/test/dial_unix_test.go
+++ b/ssh/test/dial_unix_test.go
@@ -12,7 +12,6 @@
import (
"fmt"
"io"
- "io/ioutil"
"net"
"strings"
"testing"
@@ -55,7 +54,7 @@
}
x.TestClientConn(t, conn)
defer conn.Close()
- b, err := ioutil.ReadAll(conn)
+ b, err := io.ReadAll(conn)
if err != nil {
t.Fatalf("ReadAll: %v", err)
}
diff --git a/ssh/test/forward_unix_test.go b/ssh/test/forward_unix_test.go
index ab8e639..9b82e7c 100644
--- a/ssh/test/forward_unix_test.go
+++ b/ssh/test/forward_unix_test.go
@@ -11,7 +11,6 @@
"bytes"
"fmt"
"io"
- "io/ioutil"
"math/rand"
"net"
"testing"
@@ -58,7 +57,7 @@
readChan := make(chan []byte)
go func() {
- data, _ := ioutil.ReadAll(netConn)
+ data, _ := io.ReadAll(netConn)
readChan <- data
}()
diff --git a/ssh/test/test_unix_test.go b/ssh/test/test_unix_test.go
index 804163c..95e2e30 100644
--- a/ssh/test/test_unix_test.go
+++ b/ssh/test/test_unix_test.go
@@ -14,7 +14,6 @@
"crypto/rand"
"encoding/base64"
"fmt"
- "io/ioutil"
"log"
"net"
"os"
@@ -151,7 +150,7 @@
// is used for connecting the Go SSH client with sshd without opening
// ports.
func unixConnection() (*net.UnixConn, *net.UnixConn, error) {
- dir, err := ioutil.TempDir("", "unixConnection")
+ dir, err := os.MkdirTemp("", "unixConnection")
if err != nil {
return nil, nil, err
}
@@ -316,7 +315,7 @@
if uname == "root" {
t.Skip("skipping test because current user is root")
}
- dir, err := ioutil.TempDir("", "sshtest")
+ dir, err := os.MkdirTemp("", "sshtest")
if err != nil {
t.Fatal(err)
}
@@ -365,7 +364,7 @@
}
func newTempSocket(t *testing.T) (string, func()) {
- dir, err := ioutil.TempDir("", "socket")
+ dir, err := os.MkdirTemp("", "socket")
if err != nil {
t.Fatal(err)
}
To view, visit change 430797. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages