Skip to content

Commit 840b380

Browse files
cuishuanggopherbot
cuishuang
authored and
gopherbot
committed
all: replace io/ioutil with io and os package
For #45557 Change-Id: Icd0ff87bf46592e89cd4c88754cf07c3b0c300e6 GitHub-Last-Rev: f13b442 GitHub-Pull-Request: #43 Reviewed-on: https://go-review.googlesource.com/c/exp/+/430795 Run-TryBot: Jenny Rakoczy <[email protected]> Reviewed-by: Jenny Rakoczy <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Run-TryBot: Ian Lance Taylor <[email protected]> Run-TryBot: Ian Lance Taylor <[email protected]> Reviewed-by: Meng Zhuo <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> Run-TryBot: Meng Zhuo <[email protected]> Auto-Submit: Jenny Rakoczy <[email protected]>
1 parent 2d61f44 commit 840b380

File tree

25 files changed

+77
-92
lines changed

25 files changed

+77
-92
lines changed

‎apidiff/apidiff_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bufio"
55
"fmt"
66
"go/types"
7-
"io/ioutil"
87
"os"
98
"os/exec"
109
"path/filepath"
@@ -18,7 +17,7 @@ import (
1817
)
1918

2019
func TestChanges(t *testing.T) {
21-
dir, err := ioutil.TempDir("", "apidiff_test")
20+
dir, err := os.MkdirTemp("", "apidiff_test")
2221
if err != nil {
2322
t.Fatal(err)
2423
}
@@ -63,7 +62,7 @@ func splitIntoPackages(t *testing.T, dir string) (incompatibles, compatibles []s
6362
if err := os.MkdirAll(filepath.Join(dir, "src", "apidiff"), 0700); err != nil {
6463
t.Fatal(err)
6564
}
66-
if err := ioutil.WriteFile(filepath.Join(dir, "src", "apidiff", "go.mod"), []byte("module apidiff\n"), 0666); err != nil {
65+
if err := os.WriteFile(filepath.Join(dir, "src", "apidiff", "go.mod"), []byte("module apidiff\n"), 0666); err != nil {
6766
t.Fatal(err)
6867
}
6968

‎cmd/gorelease/gorelease.go‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ import (
8888
"fmt"
8989
"go/build"
9090
"io"
91-
"io/ioutil"
9291
"log"
9392
"os"
9493
"os/exec"
@@ -166,7 +165,7 @@ func runRelease(ctx context.Context, w io.Writer, dir string, args []string) (su
166165
// test without printing to stderr.
167166
fs := flag.NewFlagSet("gorelease", flag.ContinueOnError)
168167
fs.Usage = func() {}
169-
fs.SetOutput(ioutil.Discard)
168+
fs.SetOutput(io.Discard)
170169
var baseOpt, releaseVersion string
171170
fs.StringVar(&baseOpt, "base", "", "previous version to compare against")
172171
fs.StringVar(&releaseVersion, "version", "", "proposed version to be released")
@@ -309,7 +308,7 @@ func loadLocalModule(ctx context.Context, modRoot, repoRoot, version string) (m
309308
m.diagnostics = append(m.diagnostics, fmt.Sprintf("Version %s is lower than most pseudo-versions. Consider releasing v0.1.0-0 instead.", version))
310309
}
311310

312-
m.goModData, err = ioutil.ReadFile(m.goModPath)
311+
m.goModData, err = os.ReadFile(m.goModPath)
313312
if err != nil {
314313
return moduleInfo{}, err
315314
}
@@ -371,7 +370,7 @@ func loadLocalModule(ctx context.Context, modRoot, repoRoot, version string) (m
371370
// Modules with major version suffixes can be defined in two places
372371
// (e.g., sub/go.mod and sub/v2/go.mod). They must not be defined in both.
373372
if altGoModPath != "" {
374-
if data, err := ioutil.ReadFile(altGoModPath); err == nil {
373+
if data, err := os.ReadFile(altGoModPath); err == nil {
375374
if altModPath := modfile.ModulePath(data); m.modPath == altModPath {
376375
goModRel, _ := filepath.Rel(repoRoot, m.goModPath)
377376
altGoModRel, _ := filepath.Rel(repoRoot, altGoModPath)
@@ -511,7 +510,7 @@ func loadDownloadedModule(ctx context.Context, modPath, version, max string) (m
511510
if m.modRoot, m.goModPath, err = downloadModule(ctx, v); err != nil {
512511
return moduleInfo{}, err
513512
}
514-
if m.goModData, err = ioutil.ReadFile(m.goModPath); err != nil {
513+
if m.goModData, err = os.ReadFile(m.goModPath); err != nil {
515514
return moduleInfo{}, err
516515
}
517516
if m.goModFile, err = modfile.ParseLax(m.goModPath, m.goModData, nil); err != nil {
@@ -774,7 +773,7 @@ func queryVersion(ctx context.Context, modPath, query string) (resolved string,
774773
return "", errors.New("query is based on requirements in main go.mod file")
775774
}
776775

777-
tmpDir, err := ioutil.TempDir("", "")
776+
tmpDir, err := os.MkdirTemp("", "")
778777
if err != nil {
779778
return "", err
780779
}
@@ -805,7 +804,7 @@ func loadVersions(ctx context.Context, modPath string) (versions []string, err e
805804
}
806805
}()
807806

808-
tmpDir, err := ioutil.TempDir("", "")
807+
tmpDir, err := os.MkdirTemp("", "")
809808
if err != nil {
810809
return nil, err
811810
}
@@ -882,7 +881,7 @@ func copyModuleToTempDir(repoRoot, modPath, modRoot string) (dir string, err err
882881
}
883882
m := module.Version{Path: modPath, Version: version}
884883

885-
zipFile, err := ioutil.TempFile("", "gorelease-*.zip")
884+
zipFile, err := os.CreateTemp("", "gorelease-*.zip")
886885
if err != nil {
887886
return "", err
888887
}
@@ -891,7 +890,7 @@ func copyModuleToTempDir(repoRoot, modPath, modRoot string) (dir string, err err
891890
os.Remove(zipFile.Name())
892891
}()
893892

894-
dir, err = ioutil.TempDir("", "gorelease")
893+
dir, err = os.MkdirTemp("", "gorelease")
895894
if err != nil {
896895
return "", err
897896
}
@@ -980,7 +979,7 @@ func downloadModule(ctx context.Context, m module.Version) (modRoot, goModPath s
980979
// TODO(golang.org/issue/36812): 'go mod download' reads go.mod even though
981980
// we don't need information about the main module or the build list.
982981
// If it didn't read go.mod in this case, we wouldn't need a temp directory.
983-
tmpDir, err := ioutil.TempDir("", "gorelease-download")
982+
tmpDir, err := os.MkdirTemp("", "gorelease-download")
984983
if err != nil {
985984
return "", "", err
986985
}
@@ -1073,7 +1072,7 @@ func prepareLoadDir(ctx context.Context, modFile *modfile.File, modPath, modRoot
10731072
}
10741073
}
10751074

1076-
dir, err = ioutil.TempDir("", "gorelease-load")
1075+
dir, err = os.MkdirTemp("", "gorelease-load")
10771076
if err != nil {
10781077
return "", nil, nil, nil, nil, err
10791078
}
@@ -1096,15 +1095,15 @@ func prepareLoadDir(ctx context.Context, modFile *modfile.File, modPath, modRoot
10961095
if err != nil {
10971096
return "", nil, nil, nil, nil, err
10981097
}
1099-
if err := ioutil.WriteFile(filepath.Join(dir, "go.mod"), goModData, 0666); err != nil {
1098+
if err := os.WriteFile(filepath.Join(dir, "go.mod"), goModData, 0666); err != nil {
11001099
return "", nil, nil, nil, nil, err
11011100
}
11021101

1103-
goSumData, err = ioutil.ReadFile(filepath.Join(modRoot, "go.sum"))
1102+
goSumData, err = os.ReadFile(filepath.Join(modRoot, "go.sum"))
11041103
if err != nil && !os.IsNotExist(err) {
11051104
return "", nil, nil, nil, nil, err
11061105
}
1107-
if err := ioutil.WriteFile(filepath.Join(dir, "go.sum"), goSumData, 0666); err != nil {
1106+
if err := os.WriteFile(filepath.Join(dir, "go.sum"), goSumData, 0666); err != nil {
11081107
return "", nil, nil, nil, nil, err
11091108
}
11101109

@@ -1119,7 +1118,7 @@ func prepareLoadDir(ctx context.Context, modFile *modfile.File, modPath, modRoot
11191118
for _, imp := range imps {
11201119
fmt.Fprintf(fakeImports, "import _ %q\n", imp)
11211120
}
1122-
if err := ioutil.WriteFile(filepath.Join(dir, "tmp.go"), []byte(fakeImports.String()), 0666); err != nil {
1121+
if err := os.WriteFile(filepath.Join(dir, "tmp.go"), []byte(fakeImports.String()), 0666); err != nil {
11231122
return "", nil, nil, nil, nil, err
11241123
}
11251124

@@ -1148,7 +1147,7 @@ func prepareLoadDir(ctx context.Context, modFile *modfile.File, modPath, modRoot
11481147
if err != nil {
11491148
return "", nil, nil, nil, nil, err
11501149
}
1151-
newGoModData, err := ioutil.ReadFile(goModPath)
1150+
newGoModData, err := os.ReadFile(goModPath)
11521151
if err != nil {
11531152
return "", nil, nil, nil, nil, err
11541153
}
@@ -1187,7 +1186,7 @@ func prepareLoadDir(ctx context.Context, modFile *modfile.File, modPath, modRoot
11871186
if !cached {
11881187
// Check if 'go get' added new hashes to go.sum.
11891188
goSumPath := filepath.Join(dir, "go.sum")
1190-
newGoSumData, err := ioutil.ReadFile(goSumPath)
1189+
newGoSumData, err := os.ReadFile(goSumPath)
11911190
if err != nil {
11921191
if !os.IsNotExist(err) {
11931192
return "", nil, nil, nil, nil, err

‎cmd/gorelease/gorelease_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"context"
1010
"flag"
1111
"fmt"
12-
"io/ioutil"
1312
"os"
1413
"os/exec"
1514
"path/filepath"
@@ -61,7 +60,7 @@ func prepareProxy(proxyVersions map[module.Version]bool, tests []*test) (ctx con
6160
}
6261
env = append(env, fmt.Sprintf("GOPROXY=%s", proxyURL))
6362

64-
cacheDir, err := ioutil.TempDir("", "gorelease_test-gocache")
63+
cacheDir, err := os.MkdirTemp("", "gorelease_test-gocache")
6564
if err != nil {
6665
return nil, nil, err
6766
}
@@ -267,7 +266,7 @@ func updateTest(t *test, want []byte) error {
267266

268267
wantFile.Data = want
269268
data := txtar.Format(&t.Archive)
270-
return ioutil.WriteFile(t.testPath, data, 0666)
269+
return os.WriteFile(t.testPath, data, 0666)
271270
}
272271

273272
func TestRelease(t *testing.T) {
@@ -303,7 +302,7 @@ func TestRelease(t *testing.T) {
303302
func TestRelease_gitRepo_uncommittedChanges(t *testing.T) {
304303
ctx := context.Background()
305304
buf := &bytes.Buffer{}
306-
releaseDir, err := ioutil.TempDir("", "")
305+
releaseDir, err := os.MkdirTemp("", "")
307306
if err != nil {
308307
t.Fatal(err)
309308
}
@@ -314,7 +313,7 @@ func TestRelease_gitRepo_uncommittedChanges(t *testing.T) {
314313
// Create an uncommitted change.
315314
bContents := `package b
316315
const B = "b"`
317-
if err := ioutil.WriteFile(filepath.Join(releaseDir, "b.go"), []byte(bContents), 0644); err != nil {
316+
if err := os.WriteFile(filepath.Join(releaseDir, "b.go"), []byte(bContents), 0644); err != nil {
318317
t.Fatal(err)
319318
}
320319

@@ -347,7 +346,7 @@ func testRelease(ctx context.Context, tests []*test, test *test) func(t *testing
347346

348347
// Extract the files in the release version. They may be part of the
349348
// test archive or in testdata/mod.
350-
testDir, err := ioutil.TempDir("", "")
349+
testDir, err := os.MkdirTemp("", "")
351350
if err != nil {
352351
t.Fatal(err)
353352
}
@@ -447,7 +446,7 @@ func hgInit(t *testing.T, dir string) {
447446
t.Fatal(err)
448447
}
449448

450-
if err := ioutil.WriteFile(filepath.Join(dir, ".hg", "branch"), []byte("default"), 0777); err != nil {
449+
if err := os.WriteFile(filepath.Join(dir, ".hg", "branch"), []byte("default"), 0777); err != nil {
451450
t.Fatal(err)
452451
}
453452
}
@@ -488,7 +487,7 @@ func goModInit(t *testing.T, dir string) {
488487

489488
aContents := `package a
490489
const A = "a"`
491-
if err := ioutil.WriteFile(filepath.Join(dir, "a.go"), []byte(aContents), 0644); err != nil {
490+
if err := os.WriteFile(filepath.Join(dir, "a.go"), []byte(aContents), 0644); err != nil {
492491
t.Fatal(err)
493492
}
494493

‎cmd/gorelease/proxy_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"bytes"
99
"fmt"
1010
"io"
11-
"io/ioutil"
1211
"os"
1312
"path/filepath"
1413
"sort"
@@ -30,7 +29,7 @@ import (
3029
// versions is non-empty, only those modules in mod/ that match an entry in
3130
// proxyVersions will be included.
3231
func buildProxyDir(proxyVersions map[module.Version]bool, tests []*test) (proxyDir, proxyURL string, err error) {
33-
proxyDir, err = ioutil.TempDir("", "gorelease-proxy")
32+
proxyDir, err = os.MkdirTemp("", "gorelease-proxy")
3433
if err != nil {
3534
return "", "", err
3635
}
@@ -101,7 +100,7 @@ func buildProxyDir(proxyVersions map[module.Version]bool, tests []*test) (proxyD
101100
haveMod = true
102101
}
103102
outPath := filepath.Join(modDir, version+af.Name)
104-
if err := ioutil.WriteFile(outPath, af.Data, 0666); err != nil {
103+
if err := os.WriteFile(outPath, af.Data, 0666); err != nil {
105104
return "", "", err
106105
}
107106
continue
@@ -119,13 +118,13 @@ func buildProxyDir(proxyVersions map[module.Version]bool, tests []*test) (proxyD
119118
if !haveInfo {
120119
outPath := filepath.Join(modDir, version+".info")
121120
outContent := fmt.Sprintf(`{"Version":"%s"}`, version)
122-
if err := ioutil.WriteFile(outPath, []byte(outContent), 0666); err != nil {
121+
if err := os.WriteFile(outPath, []byte(outContent), 0666); err != nil {
123122
return "", "", err
124123
}
125124
}
126125
if !haveMod && goMod.Name != "" {
127126
outPath := filepath.Join(modDir, version+".mod")
128-
if err := ioutil.WriteFile(outPath, goMod.Data, 0666); err != nil {
127+
if err := os.WriteFile(outPath, goMod.Data, 0666); err != nil {
129128
return "", "", err
130129
}
131130
}
@@ -155,7 +154,7 @@ func buildProxyDir(proxyVersions map[module.Version]bool, tests []*test) (proxyD
155154
for _, v := range versions {
156155
fmt.Fprintln(buf, v)
157156
}
158-
if err := ioutil.WriteFile(outPath, buf.Bytes(), 0666); err != nil {
157+
if err := os.WriteFile(outPath, buf.Bytes(), 0666); err != nil {
159158
return "", "", err
160159
}
161160
buf.Reset()
@@ -179,7 +178,7 @@ type txtarFile struct {
179178
func (f txtarFile) Path() string { return f.f.Name }
180179
func (f txtarFile) Lstat() (os.FileInfo, error) { return txtarFileInfo{f.f}, nil }
181180
func (f txtarFile) Open() (io.ReadCloser, error) {
182-
return ioutil.NopCloser(bytes.NewReader(f.f.Data)), nil
181+
return io.NopCloser(bytes.NewReader(f.f.Data)), nil
183182
}
184183

185184
type txtarFileInfo struct {
@@ -199,7 +198,7 @@ func extractTxtar(destDir string, arc *txtar.Archive) error {
199198
if err := os.MkdirAll(filepath.Dir(outPath), 0777); err != nil {
200199
return err
201200
}
202-
if err := ioutil.WriteFile(outPath, f.Data, 0666); err != nil {
201+
if err := os.WriteFile(outPath, f.Data, 0666); err != nil {
203202
return err
204203
}
205204
}

‎cmd/macos-roots-test/root_darwin.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"crypto/x509"
1010
"encoding/pem"
1111
"fmt"
12-
"io/ioutil"
1312
"os"
1413
"os/exec"
1514
"os/user"
@@ -142,7 +141,7 @@ func verifyCertWithSystem(cert *x509.Certificate) bool {
142141
Type: "CERTIFICATE", Bytes: cert.Raw,
143142
})
144143

145-
f, err := ioutil.TempFile("", "cert")
144+
f, err := os.CreateTemp("", "cert")
146145
if err != nil {
147146
fmt.Fprintf(os.Stderr, "can't create temporary file for cert: %v", err)
148147
return false

‎cmd/txtar/txtar.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"bytes"
3535
"flag"
3636
"fmt"
37-
"io/ioutil"
37+
"io"
3838
"os"
3939
"path"
4040
"path/filepath"
@@ -79,7 +79,7 @@ func main() {
7979
}
8080

8181
func extract() (err error) {
82-
b, err := ioutil.ReadAll(os.Stdin)
82+
b, err := io.ReadAll(os.Stdin)
8383
if err != nil {
8484
return err
8585
}
@@ -114,7 +114,7 @@ func extract() (err error) {
114114
if err := os.MkdirAll(filepath.Dir(fileName), 0777); err != nil {
115115
return err
116116
}
117-
if err := ioutil.WriteFile(fileName, f.Data, 0666); err != nil {
117+
if err := os.WriteFile(fileName, f.Data, 0666); err != nil {
118118
return err
119119
}
120120
}
@@ -143,7 +143,7 @@ func archive(paths []string) (err error) {
143143
}
144144
name := filepath.ToSlash(filepath.Join(p, suffix))
145145

146-
data, err := ioutil.ReadFile(fileName)
146+
data, err := os.ReadFile(fileName)
147147
if err != nil {
148148
return err
149149
}
@@ -172,7 +172,7 @@ func archive(paths []string) (err error) {
172172
timer := time.AfterFunc(200*time.Millisecond, func() {
173173
fmt.Fprintln(os.Stderr, "Enter comment:")
174174
})
175-
comment, err := ioutil.ReadAll(os.Stdin)
175+
comment, err := io.ReadAll(os.Stdin)
176176
timer.Stop()
177177
if err != nil {
178178
return fmt.Errorf("reading comment from %s: %v", os.Stdin.Name(), err)

0 commit comments

Comments
 (0)