Skip to content

Commit f8c659b

Browse files
panjf2000gopherbot
authored andcommitted
all: replace package ioutil with os and io in src
For #45557 Change-Id: I56824135d86452603dd4ed4bab0e24c201bb0683 Reviewed-on: https://go-review.googlesource.com/c/go/+/426257 Run-TryBot: Ian Lance Taylor <iant@google.com> Auto-Submit: Ian Lance Taylor <iant@google.com> Run-TryBot: Andy Pan <panjf2000@gmail.com> Reviewed-by: Cherry Mui <cherryyz@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@google.com>
1 parent 1e7e160 commit f8c659b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+252
-287
lines changed

src/cmd/asm/internal/asm/endtoend_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"bytes"
1010
"fmt"
1111
"internal/buildcfg"
12-
"io/ioutil"
1312
"os"
1413
"path/filepath"
1514
"regexp"
@@ -51,7 +50,7 @@ func testEndToEnd(t *testing.T, goarch, file string) {
5150
output := strings.Split(testOut.String(), "\n")
5251

5352
// Reconstruct expected output by independently "parsing" the input.
54-
data, err := ioutil.ReadFile(input)
53+
data, err := os.ReadFile(input)
5554
if err != nil {
5655
t.Error(err)
5756
return
@@ -324,7 +323,7 @@ func testErrors(t *testing.T, goarch, file string, flags ...string) {
324323
}
325324

326325
// Reconstruct expected errors by independently "parsing" the input.
327-
data, err := ioutil.ReadFile(input)
326+
data, err := os.ReadFile(input)
328327
if err != nil {
329328
t.Error(err)
330329
return

src/cmd/cgo/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"go/token"
1919
"internal/buildcfg"
2020
"io"
21-
"io/ioutil"
2221
"os"
2322
"path/filepath"
2423
"reflect"
@@ -345,7 +344,7 @@ func main() {
345344
input = aname
346345
}
347346

348-
b, err := ioutil.ReadFile(input)
347+
b, err := os.ReadFile(input)
349348
if err != nil {
350349
fatalf("%s", err)
351350
}

src/cmd/cgo/util.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"bytes"
99
"fmt"
1010
"go/token"
11-
"io/ioutil"
1211
"os"
1312
"os/exec"
1413
)
@@ -21,13 +20,13 @@ func run(stdin []byte, argv []string) (stdout, stderr []byte, ok bool) {
2120
// Some compilers have trouble with standard input.
2221
// Others have trouble with -xc.
2322
// Avoid both problems by writing a file with a .c extension.
24-
f, err := ioutil.TempFile("", "cgo-gcc-input-")
23+
f, err := os.CreateTemp("", "cgo-gcc-input-")
2524
if err != nil {
2625
fatalf("%s", err)
2726
}
2827
name := f.Name()
2928
f.Close()
30-
if err := ioutil.WriteFile(name+".c", stdin, 0666); err != nil {
29+
if err := os.WriteFile(name+".c", stdin, 0666); err != nil {
3130
os.Remove(name)
3231
fatalf("%s", err)
3332
}

src/cmd/compile/internal/base/flag.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"flag"
1010
"fmt"
1111
"internal/buildcfg"
12-
"io/ioutil"
1312
"log"
1413
"os"
1514
"reflect"
@@ -392,7 +391,7 @@ func readImportCfg(file string) {
392391
Flag.Cfg.ImportMap = make(map[string]string)
393392
}
394393
Flag.Cfg.PackageFile = map[string]string{}
395-
data, err := ioutil.ReadFile(file)
394+
data, err := os.ReadFile(file)
396395
if err != nil {
397396
log.Fatalf("-importcfg: %v", err)
398397
}
@@ -432,7 +431,7 @@ func readImportCfg(file string) {
432431
}
433432

434433
func readEmbedCfg(file string) {
435-
data, err := ioutil.ReadFile(file)
434+
data, err := os.ReadFile(file)
436435
if err != nil {
437436
log.Fatalf("-embedcfg: %v", err)
438437
}

src/cmd/compile/internal/dwarfgen/scope_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"debug/dwarf"
99
"fmt"
1010
"internal/testenv"
11-
"io/ioutil"
1211
"os"
1312
"os/exec"
1413
"path/filepath"
@@ -221,7 +220,7 @@ func TestScopeRanges(t *testing.T) {
221220
t.Skip("skipping on plan9; no DWARF symbol table in executables")
222221
}
223222

224-
dir, err := ioutil.TempDir("", "TestScopeRanges")
223+
dir, err := os.MkdirTemp("", "TestScopeRanges")
225224
if err != nil {
226225
t.Fatalf("could not create directory: %v", err)
227226
}
@@ -498,7 +497,7 @@ func TestEmptyDwarfRanges(t *testing.T) {
498497
t.Skip("skipping on plan9; no DWARF symbol table in executables")
499498
}
500499

501-
dir, err := ioutil.TempDir("", "TestEmptyDwarfRanges")
500+
dir, err := os.MkdirTemp("", "TestEmptyDwarfRanges")
502501
if err != nil {
503502
t.Fatalf("could not create directory: %v", err)
504503
}

src/cmd/compile/internal/importer/gcimporter.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ package importer
77

88
import (
99
"bufio"
10-
"cmd/compile/internal/types2"
1110
"fmt"
1211
"go/build"
1312
"internal/pkgbits"
1413
"io"
15-
"io/ioutil"
1614
"os"
1715
"path/filepath"
1816
"strings"
17+
18+
"cmd/compile/internal/types2"
1919
)
2020

2121
// debugging/development support
@@ -149,7 +149,7 @@ func Import(packages map[string]*types2.Package, path, srcDir string, lookup fun
149149
if size >= 0 {
150150
r = io.LimitReader(r, int64(size))
151151
}
152-
data, err = ioutil.ReadAll(r)
152+
data, err = io.ReadAll(r)
153153
if err != nil {
154154
break
155155
}

src/cmd/compile/internal/ir/mknode.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"go/parser"
1919
"go/token"
2020
"io/fs"
21-
"io/ioutil"
2221
"log"
2322
"sort"
2423
"strings"
@@ -160,7 +159,7 @@ func main() {
160159
// write out mangled source so we can see the bug.
161160
out = buf.Bytes()
162161
}
163-
err = ioutil.WriteFile("node_gen.go", out, 0666)
162+
err = os.WriteFile("node_gen.go", out, 0666)
164163
if err != nil {
165164
log.Fatal(err)
166165
}

src/cmd/compile/internal/logopt/logopt_test.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package logopt
66

77
import (
88
"internal/testenv"
9-
"io/ioutil"
109
"os"
1110
"os/exec"
1211
"path/filepath"
@@ -88,15 +87,15 @@ func TestLogOpt(t *testing.T) {
8887

8988
testenv.MustHaveGoBuild(t)
9089

91-
dir, err := ioutil.TempDir("", "TestLogOpt")
90+
dir, err := os.MkdirTemp("", "TestLogOpt")
9291
if err != nil {
9392
t.Fatal(err)
9493
}
9594
defer os.RemoveAll(dir)
9695

9796
dir = fixSlash(dir) // Normalize the directory name as much as possible, for Windows testing
9897
src := filepath.Join(dir, "file.go")
99-
if err := ioutil.WriteFile(src, []byte(srcCode), 0644); err != nil {
98+
if err := os.WriteFile(src, []byte(srcCode), 0644); err != nil {
10099
t.Fatal(err)
101100
}
102101

@@ -146,7 +145,7 @@ func s15a8(x *[15]int64) [15]int64 {
146145
}
147146
`
148147
copy := filepath.Join(dir, "copy.go")
149-
if err := ioutil.WriteFile(copy, []byte(copyCode), 0644); err != nil {
148+
if err := os.WriteFile(copy, []byte(copyCode), 0644); err != nil {
150149
t.Fatal(err)
151150
}
152151
outcopy := filepath.Join(dir, "copy.o")
@@ -169,7 +168,7 @@ func s15a8(x *[15]int64) [15]int64 {
169168
if err != nil {
170169
t.Error("-json=0,file://log/opt should have succeeded")
171170
}
172-
logged, err := ioutil.ReadFile(filepath.Join(dir, "log", "opt", "x", "copy.json"))
171+
logged, err := os.ReadFile(filepath.Join(dir, "log", "opt", "x", "copy.json"))
173172
if err != nil {
174173
t.Error("-json=0,file://log/opt missing expected log file")
175174
}
@@ -196,7 +195,7 @@ func s15a8(x *[15]int64) [15]int64 {
196195
if err != nil {
197196
t.Error("-json=0,file://log/opt should have succeeded")
198197
}
199-
logged, err := ioutil.ReadFile(filepath.Join(dir, "log", "opt", "x", "file.json"))
198+
logged, err := os.ReadFile(filepath.Join(dir, "log", "opt", "x", "file.json"))
200199
if err != nil {
201200
t.Error("-json=0,file://log/opt missing expected log file")
202201
}

src/cmd/compile/internal/ssa/debug_lines_test.go

+5-7
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,18 @@ import (
88
"bufio"
99
"bytes"
1010
"flag"
11-
"internal/buildcfg"
12-
"runtime"
13-
"sort"
14-
"strings"
15-
1611
"fmt"
12+
"internal/buildcfg"
1713
"internal/testenv"
18-
"io/ioutil"
1914
"os"
2015
"os/exec"
2116
"path/filepath"
2217
"reflect"
2318
"regexp"
19+
"runtime"
20+
"sort"
2421
"strconv"
22+
"strings"
2523
"testing"
2624
)
2725

@@ -129,7 +127,7 @@ func TestDebugLines_53456(t *testing.T) {
129127
func compileAndDump(t *testing.T, file, function, moreGCFlags string) []byte {
130128
testenv.MustHaveGoBuild(t)
131129

132-
tmpdir, err := ioutil.TempDir("", "debug_lines_test")
130+
tmpdir, err := os.MkdirTemp("", "debug_lines_test")
133131
if err != nil {
134132
panic(fmt.Sprintf("Problem creating TempDir, error %v", err))
135133
}

src/cmd/compile/internal/ssa/debug_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"fmt"
1010
"internal/testenv"
1111
"io"
12-
"io/ioutil"
1312
"os"
1413
"os/exec"
1514
"path/filepath"
@@ -223,7 +222,7 @@ func testNexting(t *testing.T, base, tag, gcflags string, count int, moreArgs ..
223222

224223
// Use a temporary directory unless -f is specified
225224
if !*force {
226-
tmpdir, err := ioutil.TempDir("", "debug_test")
225+
tmpdir, err := os.MkdirTemp("", "debug_test")
227226
if err != nil {
228227
panic(fmt.Sprintf("Problem creating TempDir, error %v\n", err))
229228
}
@@ -366,7 +365,7 @@ func (h *nextHist) write(filename string) {
366365

367366
func (h *nextHist) read(filename string) {
368367
h.f2i = make(map[string]uint8)
369-
bytes, err := ioutil.ReadFile(filename)
368+
bytes, err := os.ReadFile(filename)
370369
if err != nil {
371370
panic(fmt.Sprintf("Problem reading %s, error %v\n", filename, err))
372371
}

src/cmd/compile/internal/ssa/gen/main.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"flag"
1515
"fmt"
1616
"go/format"
17-
"io/ioutil"
1817
"log"
1918
"os"
2019
"path"
@@ -500,7 +499,7 @@ func genOp() {
500499
panic(err)
501500
}
502501

503-
if err := ioutil.WriteFile("../opGen.go", b, 0666); err != nil {
502+
if err := os.WriteFile("../opGen.go", b, 0666); err != nil {
504503
log.Fatalf("can't write output: %v\n", err)
505504
}
506505

@@ -521,7 +520,7 @@ func genOp() {
521520
log.Fatalf("bad opcode regexp %s: %v", pattern, err)
522521
}
523522

524-
src, err := ioutil.ReadFile(a.genfile)
523+
src, err := os.ReadFile(a.genfile)
525524
if err != nil {
526525
log.Fatalf("can't read %s: %v", a.genfile, err)
527526
}

src/cmd/compile/internal/ssa/gen/rulegen.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"go/printer"
2424
"go/token"
2525
"io"
26-
"io/ioutil"
2726
"log"
2827
"os"
2928
"path"
@@ -280,7 +279,7 @@ func genRulesSuffix(arch arch, suff string) {
280279
file, err := parser.ParseFile(fset, "", buf, parser.ParseComments)
281280
if err != nil {
282281
filename := fmt.Sprintf("%s_broken.go", arch.name)
283-
if err := ioutil.WriteFile(filename, buf.Bytes(), 0644); err != nil {
282+
if err := os.WriteFile(filename, buf.Bytes(), 0644); err != nil {
284283
log.Printf("failed to dump broken code to %s: %v", filename, err)
285284
} else {
286285
log.Printf("dumped broken code to %s", filename)

src/cmd/compile/internal/ssagen/abi.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package ssagen
77
import (
88
"fmt"
99
"internal/buildcfg"
10-
"io/ioutil"
1110
"log"
1211
"os"
1312
"strings"
@@ -59,7 +58,7 @@ func (s *SymABIs) canonicalize(linksym string) string {
5958
// the symbol name and the third field is the ABI name, as one of the
6059
// named cmd/internal/obj.ABI constants.
6160
func (s *SymABIs) ReadSymABIs(file string) {
62-
data, err := ioutil.ReadFile(file)
61+
data, err := os.ReadFile(file)
6362
if err != nil {
6463
log.Fatalf("-symabis: %v", err)
6564
}

src/cmd/compile/internal/staticdata/data.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"fmt"
1010
"go/constant"
1111
"io"
12-
"io/ioutil"
1312
"os"
1413
"sort"
1514
"strconv"
@@ -124,7 +123,7 @@ func fileStringSym(pos src.XPos, file string, readonly bool, hash []byte) (*obj.
124123
}
125124
size := info.Size()
126125
if size <= 1*1024 {
127-
data, err := ioutil.ReadAll(f)
126+
data, err := io.ReadAll(f)
128127
if err != nil {
129128
return nil, 0, err
130129
}

src/cmd/compile/internal/syntax/error_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"flag"
3333
"fmt"
3434
"internal/testenv"
35-
"io/ioutil"
3635
"os"
3736
"path/filepath"
3837
"regexp"
@@ -178,7 +177,7 @@ func testSyntaxErrors(t *testing.T, filename string) {
178177
func TestSyntaxErrors(t *testing.T) {
179178
testenv.MustHaveGoBuild(t) // we need access to source (testdata)
180179

181-
list, err := ioutil.ReadDir(testdata)
180+
list, err := os.ReadDir(testdata)
182181
if err != nil {
183182
t.Fatal(err)
184183
}

0 commit comments

Comments
 (0)