Skip to content

Commit a1d9079

Browse files
12yagopherbot
12ya
authored and
gopherbot
committed
all: replace deprecated io/ioutil package
Change-Id: Ie22fc00b1382fbf854ce5c2cd617bc9cb1e0c674 GitHub-Last-Rev: 3176a9f GitHub-Pull-Request: #110 Reviewed-on: https://go-review.googlesource.com/c/mobile/+/674035 Reviewed-by: David Chase <[email protected]> Reviewed-by: Hajime Hoshi <[email protected]> Auto-Submit: Hajime Hoshi <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 78cd7a3 commit a1d9079

28 files changed

+75
-98
lines changed

‎app/app_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"image"
1010
"image/color"
1111
_ "image/png"
12-
"io/ioutil"
1312
"net"
1413
"os"
1514
"os/exec"
@@ -56,7 +55,7 @@ func TestAndroidApp(t *testing.T) {
5655
t.Fatal(err)
5756
}
5857

59-
tmpdir, err := ioutil.TempDir("", "app-test-")
58+
tmpdir, err := os.MkdirTemp("", "app-test-")
6059
if err != nil {
6160
t.Fatal(err)
6261
}

‎bind/bind_test.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"go/token"
1616
"go/types"
1717
"io"
18-
"io/ioutil"
1918
"log"
2019
"os"
2120
"os/exec"
@@ -125,7 +124,7 @@ func diff(a, b string) string {
125124
}
126125

127126
func writeTempFile(t *testing.T, name string, contents []byte) string {
128-
f, err := ioutil.TempFile("", name)
127+
f, err := os.CreateTemp("", name)
129128
if err != nil {
130129
t.Fatal(err)
131130
}
@@ -219,14 +218,14 @@ func genObjcPackages(t *testing.T, dir string, cg *ObjcWrapper) {
219218
pkgFile := filepath.Join(pkgDir, "package.go")
220219
cg.Buf.Reset()
221220
cg.GenPackage(i)
222-
if err := ioutil.WriteFile(pkgFile, cg.Buf.Bytes(), 0600); err != nil {
221+
if err := os.WriteFile(pkgFile, cg.Buf.Bytes(), 0600); err != nil {
223222
t.Fatal(err)
224223
}
225224
}
226225
cg.Buf.Reset()
227226
cg.GenInterfaces()
228227
clsFile := filepath.Join(pkgBase, "interfaces.go")
229-
if err := ioutil.WriteFile(clsFile, cg.Buf.Bytes(), 0600); err != nil {
228+
if err := os.WriteFile(clsFile, cg.Buf.Bytes(), 0600); err != nil {
230229
t.Fatal(err)
231230
}
232231

@@ -258,15 +257,15 @@ func genJavaPackages(t *testing.T, dir string, cg *ClassGen) {
258257
pkgFile := filepath.Join(pkgDir, "package.go")
259258
cg.Buf.Reset()
260259
cg.GenPackage(i)
261-
if err := ioutil.WriteFile(pkgFile, cg.Buf.Bytes(), 0600); err != nil {
260+
if err := os.WriteFile(pkgFile, cg.Buf.Bytes(), 0600); err != nil {
262261
t.Fatal(err)
263262
}
264263
io.Copy(buf, cg.Buf)
265264
}
266265
cg.Buf.Reset()
267266
cg.GenInterfaces()
268267
clsFile := filepath.Join(pkgBase, "interfaces.go")
269-
if err := ioutil.WriteFile(clsFile, cg.Buf.Bytes(), 0600); err != nil {
268+
if err := os.WriteFile(clsFile, cg.Buf.Bytes(), 0600); err != nil {
270269
t.Fatal(err)
271270
}
272271
io.Copy(buf, cg.Buf)
@@ -306,7 +305,7 @@ func TestGenJava(t *testing.T) {
306305
}
307306
tmpGopath := ""
308307
if len(classes) > 0 {
309-
tmpGopath, err = ioutil.TempDir(os.TempDir(), "gomobile-bind-test-")
308+
tmpGopath, err = os.MkdirTemp(os.TempDir(), "gomobile-bind-test-")
310309
if err != nil {
311310
t.Fatal(err)
312311
}
@@ -423,7 +422,7 @@ func TestGenGoJavaWrappers(t *testing.T) {
423422
if err != nil {
424423
t.Fatal(err)
425424
}
426-
tmpGopath, err := ioutil.TempDir(os.TempDir(), "gomobile-bind-test-")
425+
tmpGopath, err := os.MkdirTemp(os.TempDir(), "gomobile-bind-test-")
427426
if err != nil {
428427
t.Fatal(err)
429428
}
@@ -453,7 +452,7 @@ func TestGenGoObjcWrappers(t *testing.T) {
453452
if err != nil {
454453
t.Fatal(err)
455454
}
456-
tmpGopath, err := ioutil.TempDir(os.TempDir(), "gomobile-bind-test-")
455+
tmpGopath, err := os.MkdirTemp(os.TempDir(), "gomobile-bind-test-")
457456
if err != nil {
458457
t.Fatal(err)
459458
}
@@ -499,7 +498,7 @@ func testGenGo(t *testing.T, filename string, buf *bytes.Buffer, pkg *types.Pack
499498
}
500499
golden += ".golden"
501500

502-
goldenContents, err := ioutil.ReadFile(golden)
501+
goldenContents, err := os.ReadFile(golden)
503502
if err != nil {
504503
t.Fatalf("failed to read golden file: %v", err)
505504
}

‎bind/java/seq_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package java
77
import (
88
"fmt"
99
"io"
10-
"io/ioutil"
1110
"log"
1211
"os"
1312
"os/exec"
@@ -28,7 +27,7 @@ func TestMain(m *testing.M) {
2827

2928
func testMain(m *testing.M) int {
3029
// Build gomobile and gobind and put them into PATH.
31-
binDir, err := ioutil.TempDir("", "bind-java-test-")
30+
binDir, err := os.MkdirTemp("", "bind-java-test-")
3231
if err != nil {
3332
log.Fatal(err)
3433
}
@@ -117,7 +116,7 @@ func runTest(t *testing.T, pkgNames []string, javaPkg, javaCls string) {
117116
if err != nil {
118117
t.Fatalf("failed pwd: %v", err)
119118
}
120-
tmpdir, err := ioutil.TempDir("", "bind-java-seq-test-")
119+
tmpdir, err := os.MkdirTemp("", "bind-java-seq-test-")
121120
if err != nil {
122121
t.Fatalf("failed to prepare temp dir: %v", err)
123122
}
@@ -164,20 +163,20 @@ func runTest(t *testing.T, pkgNames []string, javaPkg, javaCls string) {
164163
}
165164

166165
fname = filepath.Join(tmpdir, "src/main/AndroidManifest.xml")
167-
err = ioutil.WriteFile(fname, []byte(androidmanifest), 0700)
166+
err = os.WriteFile(fname, []byte(androidmanifest), 0700)
168167
if err != nil {
169168
t.Fatalf("failed to write android manifest file: %v", err)
170169
}
171170

172171
// Add a dummy string resource to avoid errors from the Android build system.
173172
fname = filepath.Join(tmpdir, "src/main/res/values/strings.xml")
174-
err = ioutil.WriteFile(fname, []byte(stringsxml), 0700)
173+
err = os.WriteFile(fname, []byte(stringsxml), 0700)
175174
if err != nil {
176175
t.Fatalf("failed to write strings.xml file: %v", err)
177176
}
178177

179178
fname = filepath.Join(tmpdir, "build.gradle")
180-
err = ioutil.WriteFile(fname, []byte(buildgradle), 0700)
179+
err = os.WriteFile(fname, []byte(buildgradle), 0700)
181180
if err != nil {
182181
t.Fatalf("failed to write build.gradle file: %v", err)
183182
}

‎bind/objc/seq_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"flag"
99
"fmt"
1010
"io"
11-
"io/ioutil"
1211
"log"
1312
"os"
1413
"os/exec"
@@ -43,7 +42,7 @@ func TestMain(m *testing.M) {
4342
}
4443

4544
func testMain(m *testing.M) int {
46-
binDir, err := ioutil.TempDir("", "bind-objc-test-")
45+
binDir, err := os.MkdirTemp("", "bind-objc-test-")
4746
if err != nil {
4847
log.Fatal(err)
4948
}
@@ -108,7 +107,7 @@ func runTest(t *testing.T, pkgNames []string, prefix, testfile, framework string
108107
t.Skip("command xcodebuild not found, skipping")
109108
}
110109

111-
tmpdir, err := ioutil.TempDir("", "bind-objc-seq-test-")
110+
tmpdir, err := os.MkdirTemp("", "bind-objc-seq-test-")
112111
if err != nil {
113112
t.Fatalf("failed to prepare temp dir: %v", err)
114113
}
@@ -200,7 +199,7 @@ func createProject(dir, testfile, framework string) error {
200199
{"xcodetest/AppDelegate.m", appdelegatem},
201200
}
202201
for _, f := range files {
203-
if err := ioutil.WriteFile(filepath.Join(dir, f.path), []byte(f.content), 0700); err != nil {
202+
if err := os.WriteFile(filepath.Join(dir, f.path), []byte(f.content), 0700); err != nil {
204203
return err
205204
}
206205
}

‎bind/testdata/testpkg/testpkg.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"context"
1313
"errors"
1414
"fmt"
15-
"io/ioutil"
15+
"io"
1616
"log"
1717
"math"
1818
"os"
@@ -232,7 +232,7 @@ func ReadAsset() string {
232232
}
233233
defer rc.Close()
234234

235-
b, err := ioutil.ReadAll(rc)
235+
b, err := io.ReadAll(rc)
236236
if err != nil {
237237
log.Fatal(err)
238238
}

‎cmd/gobind/gen.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"go/token"
1212
"go/types"
1313
"io"
14-
"io/ioutil"
1514
"os"
1615
"path/filepath"
1716
"strings"
@@ -203,7 +202,7 @@ func genObjcPackages(dir string, types []*objc.Named, embedders []importers.Stru
203202
pkgFile := filepath.Join(pkgDir, "package.go")
204203
buf.Reset()
205204
cg.GenPackage(i)
206-
if err := ioutil.WriteFile(pkgFile, buf.Bytes(), 0600); err != nil {
205+
if err := os.WriteFile(pkgFile, buf.Bytes(), 0600); err != nil {
207206
return err
208207
}
209208
}
@@ -213,7 +212,7 @@ func genObjcPackages(dir string, types []*objc.Named, embedders []importers.Stru
213212
if err := os.MkdirAll(objcBase, 0700); err != nil {
214213
return err
215214
}
216-
if err := ioutil.WriteFile(filepath.Join(objcBase, "interfaces.go"), buf.Bytes(), 0600); err != nil {
215+
if err := os.WriteFile(filepath.Join(objcBase, "interfaces.go"), buf.Bytes(), 0600); err != nil {
217216
return err
218217
}
219218
goBase := filepath.Join(dir, "src", "gobind")
@@ -222,17 +221,17 @@ func genObjcPackages(dir string, types []*objc.Named, embedders []importers.Stru
222221
}
223222
buf.Reset()
224223
cg.GenGo()
225-
if err := ioutil.WriteFile(filepath.Join(goBase, "interfaces_darwin.go"), buf.Bytes(), 0600); err != nil {
224+
if err := os.WriteFile(filepath.Join(goBase, "interfaces_darwin.go"), buf.Bytes(), 0600); err != nil {
226225
return err
227226
}
228227
buf.Reset()
229228
cg.GenH()
230-
if err := ioutil.WriteFile(filepath.Join(goBase, "interfaces.h"), buf.Bytes(), 0600); err != nil {
229+
if err := os.WriteFile(filepath.Join(goBase, "interfaces.h"), buf.Bytes(), 0600); err != nil {
231230
return err
232231
}
233232
buf.Reset()
234233
cg.GenM()
235-
if err := ioutil.WriteFile(filepath.Join(goBase, "interfaces_darwin.m"), buf.Bytes(), 0600); err != nil {
234+
if err := os.WriteFile(filepath.Join(goBase, "interfaces_darwin.m"), buf.Bytes(), 0600); err != nil {
236235
return err
237236
}
238237
return nil
@@ -256,7 +255,7 @@ func genJavaPackages(dir string, classes []*java.Class, embedders []importers.St
256255
pkgFile := filepath.Join(pkgDir, "package.go")
257256
buf.Reset()
258257
cg.GenPackage(i)
259-
if err := ioutil.WriteFile(pkgFile, buf.Bytes(), 0600); err != nil {
258+
if err := os.WriteFile(pkgFile, buf.Bytes(), 0600); err != nil {
260259
return err
261260
}
262261
}
@@ -266,7 +265,7 @@ func genJavaPackages(dir string, classes []*java.Class, embedders []importers.St
266265
if err := os.MkdirAll(javaBase, 0700); err != nil {
267266
return err
268267
}
269-
if err := ioutil.WriteFile(filepath.Join(javaBase, "interfaces.go"), buf.Bytes(), 0600); err != nil {
268+
if err := os.WriteFile(filepath.Join(javaBase, "interfaces.go"), buf.Bytes(), 0600); err != nil {
270269
return err
271270
}
272271
goBase := filepath.Join(dir, "src", "gobind")
@@ -275,17 +274,17 @@ func genJavaPackages(dir string, classes []*java.Class, embedders []importers.St
275274
}
276275
buf.Reset()
277276
cg.GenGo()
278-
if err := ioutil.WriteFile(filepath.Join(goBase, "classes_android.go"), buf.Bytes(), 0600); err != nil {
277+
if err := os.WriteFile(filepath.Join(goBase, "classes_android.go"), buf.Bytes(), 0600); err != nil {
279278
return err
280279
}
281280
buf.Reset()
282281
cg.GenH()
283-
if err := ioutil.WriteFile(filepath.Join(goBase, "classes.h"), buf.Bytes(), 0600); err != nil {
282+
if err := os.WriteFile(filepath.Join(goBase, "classes.h"), buf.Bytes(), 0600); err != nil {
284283
return err
285284
}
286285
buf.Reset()
287286
cg.GenC()
288-
if err := ioutil.WriteFile(filepath.Join(goBase, "classes_android.c"), buf.Bytes(), 0600); err != nil {
287+
if err := os.WriteFile(filepath.Join(goBase, "classes_android.c"), buf.Bytes(), 0600); err != nil {
289288
return err
290289
}
291290
return nil

‎cmd/gobind/main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"fmt"
1111
"go/ast"
1212
"go/types"
13-
"io/ioutil"
1413
"log"
1514
"os"
1615
"os/exec"
@@ -102,7 +101,7 @@ func run() {
102101
if len(classes) > 0 || len(otypes) > 0 {
103102
srcDir := *outdir
104103
if srcDir == "" {
105-
srcDir, err = ioutil.TempDir(os.TempDir(), "gobind-")
104+
srcDir, err = os.MkdirTemp(os.TempDir(), "gobind-")
106105
if err != nil {
107106
log.Fatal(err)
108107
}

‎cmd/gomobile/bind.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"errors"
1111
"fmt"
1212
"io"
13-
"io/ioutil"
1413
"os"
1514
"os/exec"
1615
"path/filepath"
@@ -197,7 +196,7 @@ func writeFile(filename string, generate func(io.Writer) error) error {
197196
}
198197

199198
if buildN {
200-
return generate(ioutil.Discard)
199+
return generate(io.Discard)
201200
}
202201

203202
f, err := os.Create(filename)

‎cmd/gomobile/bind_androidapp.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"archive/zip"
99
"fmt"
1010
"io"
11-
"io/ioutil"
1211
"os"
1312
"os/exec"
1413
"path/filepath"
@@ -73,7 +72,7 @@ func goAndroidBind(gobind string, pkgs []*packages.Package, targets []targetInfo
7372
}
7473

7574
func buildSrcJar(src string) error {
76-
var out io.Writer = ioutil.Discard
75+
var out io.Writer = io.Discard
7776
if !buildN {
7877
ext := filepath.Ext(buildO)
7978
f, err := os.Create(buildO[:len(buildO)-len(ext)] + "-sources.jar")
@@ -110,7 +109,7 @@ func buildSrcJar(src string) error {
110109
//
111110
// javac and jar commands are needed to build classes.jar.
112111
func buildAAR(srcDir, androidDir string, pkgs []*packages.Package, targets []targetInfo) (err error) {
113-
var out io.Writer = ioutil.Discard
112+
var out io.Writer = io.Discard
114113
if buildO == "" {
115114
buildO = pkgs[0].Name + ".aar"
116115
}

‎cmd/gomobile/build_androidapp.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"errors"
1414
"fmt"
1515
"io"
16-
"io/ioutil"
1716
"log"
1817
"os"
1918
"path"
@@ -37,7 +36,7 @@ func goAndroidBuild(pkg *packages.Package, targets []targetInfo) (map[string]boo
3736
dir := filepath.Dir(pkg.GoFiles[0])
3837

3938
manifestPath := filepath.Join(dir, "AndroidManifest.xml")
40-
manifestData, err := ioutil.ReadFile(manifestPath)
39+
manifestData, err := os.ReadFile(manifestPath)
4140
if err != nil {
4241
if !os.IsNotExist(err) {
4342
return nil, err
@@ -129,7 +128,7 @@ func goAndroidBuild(pkg *packages.Package, targets []targetInfo) (map[string]boo
129128
fmt.Fprintf(os.Stderr, "apk: %s\n", name)
130129
}
131130
if buildN {
132-
return ioutil.Discard, nil
131+
return io.Discard, nil
133132
}
134133
return apkw.Create(name)
135134
}

0 commit comments

Comments
 (0)