From a1d90793fc63015513ae877a689ddcc0903750ae Mon Sep 17 00:00:00 2001 From: Iliya Lyan <68940374+12ya@users.noreply.github.com> Date: Mon, 19 May 2025 12:08:46 +0000 Subject: [PATCH] all: replace deprecated io/ioutil package Change-Id: Ie22fc00b1382fbf854ce5c2cd617bc9cb1e0c674 GitHub-Last-Rev: 3176a9fecffd48bad69493a188116a4f0961640d GitHub-Pull-Request: golang/mobile#110 Reviewed-on: https://go-review.googlesource.com/c/mobile/+/674035 Reviewed-by: David Chase Reviewed-by: Hajime Hoshi Auto-Submit: Hajime Hoshi LUCI-TryBot-Result: Go LUCI Reviewed-by: Dmitri Shuralyov --- app/app_test.go | 3 +-- bind/bind_test.go | 19 +++++++++---------- bind/java/seq_test.go | 11 +++++------ bind/objc/seq_test.go | 7 +++---- bind/testdata/testpkg/testpkg.go | 4 ++-- cmd/gobind/gen.go | 21 ++++++++++----------- cmd/gobind/main.go | 3 +-- cmd/gomobile/bind.go | 3 +-- cmd/gomobile/bind_androidapp.go | 5 ++--- cmd/gomobile/build_androidapp.go | 5 ++--- cmd/gomobile/build_apple.go | 3 +-- cmd/gomobile/build_test.go | 3 +-- cmd/gomobile/cert_test.go | 3 +-- cmd/gomobile/env.go | 5 ++--- cmd/gomobile/env_test.go | 3 +-- cmd/gomobile/gendex.go | 5 ++--- cmd/gomobile/init.go | 5 ++--- cmd/gomobile/init_test.go | 5 ++--- cmd/gomobile/main.go | 3 +-- cmd/gomobile/writer_test.go | 5 ++--- exp/f32/gen.go | 4 ++-- exp/font/font_android.go | 6 +++--- exp/font/font_linux.go | 10 +++++----- exp/sprite/portable/affine_test.go | 3 +-- gl/dll_windows.go | 17 ++++++++--------- gl/gendebug.go | 3 +-- internal/binres/binres_test.go | 5 ++--- internal/binres/genarsc.go | 4 ++-- 28 files changed, 75 insertions(+), 98 deletions(-) diff --git a/app/app_test.go b/app/app_test.go index 9174219..9fa2a18 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -9,7 +9,6 @@ import ( "image" "image/color" _ "image/png" - "io/ioutil" "net" "os" "os/exec" @@ -56,7 +55,7 @@ func TestAndroidApp(t *testing.T) { t.Fatal(err) } - tmpdir, err := ioutil.TempDir("", "app-test-") + tmpdir, err := os.MkdirTemp("", "app-test-") if err != nil { t.Fatal(err) } diff --git a/bind/bind_test.go b/bind/bind_test.go index af09733..96288a4 100644 --- a/bind/bind_test.go +++ b/bind/bind_test.go @@ -15,7 +15,6 @@ import ( "go/token" "go/types" "io" - "io/ioutil" "log" "os" "os/exec" @@ -125,7 +124,7 @@ func diff(a, b string) string { } func writeTempFile(t *testing.T, name string, contents []byte) string { - f, err := ioutil.TempFile("", name) + f, err := os.CreateTemp("", name) if err != nil { t.Fatal(err) } @@ -219,14 +218,14 @@ func genObjcPackages(t *testing.T, dir string, cg *ObjcWrapper) { pkgFile := filepath.Join(pkgDir, "package.go") cg.Buf.Reset() cg.GenPackage(i) - if err := ioutil.WriteFile(pkgFile, cg.Buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(pkgFile, cg.Buf.Bytes(), 0600); err != nil { t.Fatal(err) } } cg.Buf.Reset() cg.GenInterfaces() clsFile := filepath.Join(pkgBase, "interfaces.go") - if err := ioutil.WriteFile(clsFile, cg.Buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(clsFile, cg.Buf.Bytes(), 0600); err != nil { t.Fatal(err) } @@ -258,7 +257,7 @@ func genJavaPackages(t *testing.T, dir string, cg *ClassGen) { pkgFile := filepath.Join(pkgDir, "package.go") cg.Buf.Reset() cg.GenPackage(i) - if err := ioutil.WriteFile(pkgFile, cg.Buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(pkgFile, cg.Buf.Bytes(), 0600); err != nil { t.Fatal(err) } io.Copy(buf, cg.Buf) @@ -266,7 +265,7 @@ func genJavaPackages(t *testing.T, dir string, cg *ClassGen) { cg.Buf.Reset() cg.GenInterfaces() clsFile := filepath.Join(pkgBase, "interfaces.go") - if err := ioutil.WriteFile(clsFile, cg.Buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(clsFile, cg.Buf.Bytes(), 0600); err != nil { t.Fatal(err) } io.Copy(buf, cg.Buf) @@ -306,7 +305,7 @@ func TestGenJava(t *testing.T) { } tmpGopath := "" if len(classes) > 0 { - tmpGopath, err = ioutil.TempDir(os.TempDir(), "gomobile-bind-test-") + tmpGopath, err = os.MkdirTemp(os.TempDir(), "gomobile-bind-test-") if err != nil { t.Fatal(err) } @@ -423,7 +422,7 @@ func TestGenGoJavaWrappers(t *testing.T) { if err != nil { t.Fatal(err) } - tmpGopath, err := ioutil.TempDir(os.TempDir(), "gomobile-bind-test-") + tmpGopath, err := os.MkdirTemp(os.TempDir(), "gomobile-bind-test-") if err != nil { t.Fatal(err) } @@ -453,7 +452,7 @@ func TestGenGoObjcWrappers(t *testing.T) { if err != nil { t.Fatal(err) } - tmpGopath, err := ioutil.TempDir(os.TempDir(), "gomobile-bind-test-") + tmpGopath, err := os.MkdirTemp(os.TempDir(), "gomobile-bind-test-") if err != nil { t.Fatal(err) } @@ -499,7 +498,7 @@ func testGenGo(t *testing.T, filename string, buf *bytes.Buffer, pkg *types.Pack } golden += ".golden" - goldenContents, err := ioutil.ReadFile(golden) + goldenContents, err := os.ReadFile(golden) if err != nil { t.Fatalf("failed to read golden file: %v", err) } diff --git a/bind/java/seq_test.go b/bind/java/seq_test.go index a5151d4..4d9cd2f 100644 --- a/bind/java/seq_test.go +++ b/bind/java/seq_test.go @@ -7,7 +7,6 @@ package java import ( "fmt" "io" - "io/ioutil" "log" "os" "os/exec" @@ -28,7 +27,7 @@ func TestMain(m *testing.M) { func testMain(m *testing.M) int { // Build gomobile and gobind and put them into PATH. - binDir, err := ioutil.TempDir("", "bind-java-test-") + binDir, err := os.MkdirTemp("", "bind-java-test-") if err != nil { log.Fatal(err) } @@ -117,7 +116,7 @@ func runTest(t *testing.T, pkgNames []string, javaPkg, javaCls string) { if err != nil { t.Fatalf("failed pwd: %v", err) } - tmpdir, err := ioutil.TempDir("", "bind-java-seq-test-") + tmpdir, err := os.MkdirTemp("", "bind-java-seq-test-") if err != nil { t.Fatalf("failed to prepare temp dir: %v", err) } @@ -164,20 +163,20 @@ func runTest(t *testing.T, pkgNames []string, javaPkg, javaCls string) { } fname = filepath.Join(tmpdir, "src/main/AndroidManifest.xml") - err = ioutil.WriteFile(fname, []byte(androidmanifest), 0700) + err = os.WriteFile(fname, []byte(androidmanifest), 0700) if err != nil { t.Fatalf("failed to write android manifest file: %v", err) } // Add a dummy string resource to avoid errors from the Android build system. fname = filepath.Join(tmpdir, "src/main/res/values/strings.xml") - err = ioutil.WriteFile(fname, []byte(stringsxml), 0700) + err = os.WriteFile(fname, []byte(stringsxml), 0700) if err != nil { t.Fatalf("failed to write strings.xml file: %v", err) } fname = filepath.Join(tmpdir, "build.gradle") - err = ioutil.WriteFile(fname, []byte(buildgradle), 0700) + err = os.WriteFile(fname, []byte(buildgradle), 0700) if err != nil { t.Fatalf("failed to write build.gradle file: %v", err) } diff --git a/bind/objc/seq_test.go b/bind/objc/seq_test.go index e6ef5e7..0aa4bdc 100644 --- a/bind/objc/seq_test.go +++ b/bind/objc/seq_test.go @@ -8,7 +8,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "os" "os/exec" @@ -43,7 +42,7 @@ func TestMain(m *testing.M) { } func testMain(m *testing.M) int { - binDir, err := ioutil.TempDir("", "bind-objc-test-") + binDir, err := os.MkdirTemp("", "bind-objc-test-") if err != nil { log.Fatal(err) } @@ -108,7 +107,7 @@ func runTest(t *testing.T, pkgNames []string, prefix, testfile, framework string t.Skip("command xcodebuild not found, skipping") } - tmpdir, err := ioutil.TempDir("", "bind-objc-seq-test-") + tmpdir, err := os.MkdirTemp("", "bind-objc-seq-test-") if err != nil { t.Fatalf("failed to prepare temp dir: %v", err) } @@ -200,7 +199,7 @@ func createProject(dir, testfile, framework string) error { {"xcodetest/AppDelegate.m", appdelegatem}, } for _, f := range files { - if err := ioutil.WriteFile(filepath.Join(dir, f.path), []byte(f.content), 0700); err != nil { + if err := os.WriteFile(filepath.Join(dir, f.path), []byte(f.content), 0700); err != nil { return err } } diff --git a/bind/testdata/testpkg/testpkg.go b/bind/testdata/testpkg/testpkg.go index cd7a2ea..40203bf 100644 --- a/bind/testdata/testpkg/testpkg.go +++ b/bind/testdata/testpkg/testpkg.go @@ -12,7 +12,7 @@ import ( "context" "errors" "fmt" - "io/ioutil" + "io" "log" "math" "os" @@ -232,7 +232,7 @@ func ReadAsset() string { } defer rc.Close() - b, err := ioutil.ReadAll(rc) + b, err := io.ReadAll(rc) if err != nil { log.Fatal(err) } diff --git a/cmd/gobind/gen.go b/cmd/gobind/gen.go index 87c72d9..1bce3a4 100644 --- a/cmd/gobind/gen.go +++ b/cmd/gobind/gen.go @@ -11,7 +11,6 @@ import ( "go/token" "go/types" "io" - "io/ioutil" "os" "path/filepath" "strings" @@ -203,7 +202,7 @@ func genObjcPackages(dir string, types []*objc.Named, embedders []importers.Stru pkgFile := filepath.Join(pkgDir, "package.go") buf.Reset() cg.GenPackage(i) - if err := ioutil.WriteFile(pkgFile, buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(pkgFile, buf.Bytes(), 0600); err != nil { return err } } @@ -213,7 +212,7 @@ func genObjcPackages(dir string, types []*objc.Named, embedders []importers.Stru if err := os.MkdirAll(objcBase, 0700); err != nil { return err } - if err := ioutil.WriteFile(filepath.Join(objcBase, "interfaces.go"), buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(filepath.Join(objcBase, "interfaces.go"), buf.Bytes(), 0600); err != nil { return err } goBase := filepath.Join(dir, "src", "gobind") @@ -222,17 +221,17 @@ func genObjcPackages(dir string, types []*objc.Named, embedders []importers.Stru } buf.Reset() cg.GenGo() - if err := ioutil.WriteFile(filepath.Join(goBase, "interfaces_darwin.go"), buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(filepath.Join(goBase, "interfaces_darwin.go"), buf.Bytes(), 0600); err != nil { return err } buf.Reset() cg.GenH() - if err := ioutil.WriteFile(filepath.Join(goBase, "interfaces.h"), buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(filepath.Join(goBase, "interfaces.h"), buf.Bytes(), 0600); err != nil { return err } buf.Reset() cg.GenM() - if err := ioutil.WriteFile(filepath.Join(goBase, "interfaces_darwin.m"), buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(filepath.Join(goBase, "interfaces_darwin.m"), buf.Bytes(), 0600); err != nil { return err } return nil @@ -256,7 +255,7 @@ func genJavaPackages(dir string, classes []*java.Class, embedders []importers.St pkgFile := filepath.Join(pkgDir, "package.go") buf.Reset() cg.GenPackage(i) - if err := ioutil.WriteFile(pkgFile, buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(pkgFile, buf.Bytes(), 0600); err != nil { return err } } @@ -266,7 +265,7 @@ func genJavaPackages(dir string, classes []*java.Class, embedders []importers.St if err := os.MkdirAll(javaBase, 0700); err != nil { return err } - if err := ioutil.WriteFile(filepath.Join(javaBase, "interfaces.go"), buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(filepath.Join(javaBase, "interfaces.go"), buf.Bytes(), 0600); err != nil { return err } goBase := filepath.Join(dir, "src", "gobind") @@ -275,17 +274,17 @@ func genJavaPackages(dir string, classes []*java.Class, embedders []importers.St } buf.Reset() cg.GenGo() - if err := ioutil.WriteFile(filepath.Join(goBase, "classes_android.go"), buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(filepath.Join(goBase, "classes_android.go"), buf.Bytes(), 0600); err != nil { return err } buf.Reset() cg.GenH() - if err := ioutil.WriteFile(filepath.Join(goBase, "classes.h"), buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(filepath.Join(goBase, "classes.h"), buf.Bytes(), 0600); err != nil { return err } buf.Reset() cg.GenC() - if err := ioutil.WriteFile(filepath.Join(goBase, "classes_android.c"), buf.Bytes(), 0600); err != nil { + if err := os.WriteFile(filepath.Join(goBase, "classes_android.c"), buf.Bytes(), 0600); err != nil { return err } return nil diff --git a/cmd/gobind/main.go b/cmd/gobind/main.go index b250308..bf1e777 100644 --- a/cmd/gobind/main.go +++ b/cmd/gobind/main.go @@ -10,7 +10,6 @@ import ( "fmt" "go/ast" "go/types" - "io/ioutil" "log" "os" "os/exec" @@ -102,7 +101,7 @@ func run() { if len(classes) > 0 || len(otypes) > 0 { srcDir := *outdir if srcDir == "" { - srcDir, err = ioutil.TempDir(os.TempDir(), "gobind-") + srcDir, err = os.MkdirTemp(os.TempDir(), "gobind-") if err != nil { log.Fatal(err) } diff --git a/cmd/gomobile/bind.go b/cmd/gomobile/bind.go index 4e1c453..2cab560 100644 --- a/cmd/gomobile/bind.go +++ b/cmd/gomobile/bind.go @@ -10,7 +10,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -197,7 +196,7 @@ func writeFile(filename string, generate func(io.Writer) error) error { } if buildN { - return generate(ioutil.Discard) + return generate(io.Discard) } f, err := os.Create(filename) diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go index a8fab27..d03e649 100644 --- a/cmd/gomobile/bind_androidapp.go +++ b/cmd/gomobile/bind_androidapp.go @@ -8,7 +8,6 @@ import ( "archive/zip" "fmt" "io" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -73,7 +72,7 @@ func goAndroidBind(gobind string, pkgs []*packages.Package, targets []targetInfo } func buildSrcJar(src string) error { - var out io.Writer = ioutil.Discard + var out io.Writer = io.Discard if !buildN { ext := filepath.Ext(buildO) f, err := os.Create(buildO[:len(buildO)-len(ext)] + "-sources.jar") @@ -110,7 +109,7 @@ func buildSrcJar(src string) error { // // javac and jar commands are needed to build classes.jar. func buildAAR(srcDir, androidDir string, pkgs []*packages.Package, targets []targetInfo) (err error) { - var out io.Writer = ioutil.Discard + var out io.Writer = io.Discard if buildO == "" { buildO = pkgs[0].Name + ".aar" } diff --git a/cmd/gomobile/build_androidapp.go b/cmd/gomobile/build_androidapp.go index 5063f94..48837b5 100644 --- a/cmd/gomobile/build_androidapp.go +++ b/cmd/gomobile/build_androidapp.go @@ -13,7 +13,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "os" "path" @@ -37,7 +36,7 @@ func goAndroidBuild(pkg *packages.Package, targets []targetInfo) (map[string]boo dir := filepath.Dir(pkg.GoFiles[0]) manifestPath := filepath.Join(dir, "AndroidManifest.xml") - manifestData, err := ioutil.ReadFile(manifestPath) + manifestData, err := os.ReadFile(manifestPath) if err != nil { if !os.IsNotExist(err) { return nil, err @@ -129,7 +128,7 @@ func goAndroidBuild(pkg *packages.Package, targets []targetInfo) (map[string]boo fmt.Fprintf(os.Stderr, "apk: %s\n", name) } if buildN { - return ioutil.Discard, nil + return io.Discard, nil } return apkw.Create(name) } diff --git a/cmd/gomobile/build_apple.go b/cmd/gomobile/build_apple.go index 298367b..1919a7e 100644 --- a/cmd/gomobile/build_apple.go +++ b/cmd/gomobile/build_apple.go @@ -9,7 +9,6 @@ import ( "crypto/x509" "encoding/pem" "fmt" - "io/ioutil" "os" "os/exec" "path" @@ -69,7 +68,7 @@ func goAppleBuild(pkg *packages.Package, bundleID string, targets []targetInfo) printcmd("echo \"%s\" > %s", file.contents, file.name) } if !buildN { - if err := ioutil.WriteFile(file.name, file.contents, 0644); err != nil { + if err := os.WriteFile(file.name, file.contents, 0644); err != nil { return nil, err } } diff --git a/cmd/gomobile/build_test.go b/cmd/gomobile/build_test.go index 5cec2ac..e5e412a 100644 --- a/cmd/gomobile/build_test.go +++ b/cmd/gomobile/build_test.go @@ -6,7 +6,6 @@ package main import ( "bytes" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -212,7 +211,7 @@ func TestBuildWithGoModules(t *testing.T) { t.Skipf("gomobile are not available on %s", runtime.GOOS) } - dir, err := ioutil.TempDir("", "gomobile-test") + dir, err := os.MkdirTemp("", "gomobile-test") if err != nil { t.Fatal(err) } diff --git a/cmd/gomobile/cert_test.go b/cmd/gomobile/cert_test.go index c871394..c5c5e3c 100644 --- a/cmd/gomobile/cert_test.go +++ b/cmd/gomobile/cert_test.go @@ -8,7 +8,6 @@ import ( "crypto/rand" "crypto/x509" "encoding/pem" - "io/ioutil" "os" "os/exec" "testing" @@ -30,7 +29,7 @@ func TestSignPKCS7(t *testing.T) { if err != nil { t.Fatal(err) } - sig, err := ioutil.TempFile("", "content.rsa") + sig, err := os.CreateTemp("", "content.rsa") if err != nil { t.Fatal(err) } diff --git a/cmd/gomobile/env.go b/cmd/gomobile/env.go index 3205979..869e38c 100644 --- a/cmd/gomobile/env.go +++ b/cmd/gomobile/env.go @@ -10,7 +10,6 @@ import ( "errors" "fmt" "io/fs" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -144,7 +143,7 @@ func buildEnvInit() (cleanup func(), err error) { tmpdir = "$WORK" cleanupFn = func() {} } else { - tmpdir, err = ioutil.TempDir("", "gomobile-work-") + tmpdir, err = os.MkdirTemp("", "gomobile-work-") if err != nil { return nil, err } @@ -340,7 +339,7 @@ func checkNDKRoot(ndkRoot string, targets []targetInfo) error { // compatibleNDKRoots searches the side-by-side NDK dirs for compatible SDKs. func compatibleNDKRoots(ndkForest string, targets []targetInfo) ([]string, error) { - ndkDirs, err := ioutil.ReadDir(ndkForest) + ndkDirs, err := os.ReadDir(ndkForest) if err != nil { return nil, err } diff --git a/cmd/gomobile/env_test.go b/cmd/gomobile/env_test.go index 1b9e452..9090eaa 100644 --- a/cmd/gomobile/env_test.go +++ b/cmd/gomobile/env_test.go @@ -6,14 +6,13 @@ package main import ( "fmt" - "io/ioutil" "os" "path/filepath" "testing" ) func TestNdkRoot(t *testing.T) { - home, err := ioutil.TempDir("", "gomobile-test-") + home, err := os.MkdirTemp("", "gomobile-test-") if err != nil { t.Fatal(err) } diff --git a/cmd/gomobile/gendex.go b/cmd/gomobile/gendex.go index 9ef5b31..1e5efc9 100644 --- a/cmd/gomobile/gendex.go +++ b/cmd/gomobile/gendex.go @@ -23,7 +23,6 @@ import ( "flag" "fmt" "go/format" - "io/ioutil" "log" "os" "os/exec" @@ -40,7 +39,7 @@ func main() { flag.Parse() var err error - tmpdir, err = ioutil.TempDir("", "gendex-") + tmpdir, err = os.MkdirTemp("", "gendex-") if err != nil { log.Fatal(err) } @@ -98,7 +97,7 @@ func gendex() error { os.Stderr.Write(out) return err } - src, err := ioutil.ReadFile(tmpdir + "/classes.dex") + src, err := os.ReadFile(tmpdir + "/classes.dex") if err != nil { return err } diff --git a/cmd/gomobile/init.go b/cmd/gomobile/init.go index 48642e2..be4eaea 100644 --- a/cmd/gomobile/init.go +++ b/cmd/gomobile/init.go @@ -9,7 +9,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -63,7 +62,7 @@ func runInit(cmd *command) error { tmpdir = filepath.Join(gomobilepath, "work") } else { var err error - tmpdir, err = ioutil.TempDir(gomobilepath, "work-") + tmpdir, err = os.MkdirTemp(gomobilepath, "work-") if err != nil { return err } @@ -153,7 +152,7 @@ func installOpenAL(gomobilepath string) error { alTmpDir = filepath.Join(gomobilepath, "work") } else { var err error - alTmpDir, err = ioutil.TempDir(gomobilepath, "openal-release-") + alTmpDir, err = os.MkdirTemp(gomobilepath, "openal-release-") if err != nil { return err } diff --git a/cmd/gomobile/init_test.go b/cmd/gomobile/init_test.go index 8a51e75..0e73717 100644 --- a/cmd/gomobile/init_test.go +++ b/cmd/gomobile/init_test.go @@ -6,7 +6,6 @@ package main import ( "bytes" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -40,7 +39,7 @@ func TestInit(t *testing.T) { // Test that first GOPATH element is chosen correctly. var err error - gopath, err = ioutil.TempDir("", "gomobile-test") + gopath, err = os.MkdirTemp("", "gomobile-test") if err != nil { t.Fatal(err) } @@ -55,7 +54,7 @@ func TestInit(t *testing.T) { os.Setenv("HOMEDRIVE", "C:") } - emptymod, err := ioutil.TempDir("", "gomobile-test") + emptymod, err := os.MkdirTemp("", "gomobile-test") if err != nil { t.Fatal(err) } diff --git a/cmd/gomobile/main.go b/cmd/gomobile/main.go index 2d280b8..c123263 100644 --- a/cmd/gomobile/main.go +++ b/cmd/gomobile/main.go @@ -13,7 +13,6 @@ import ( "fmt" "html/template" "io" - "io/ioutil" "log" "os" "os/exec" @@ -159,7 +158,7 @@ func helpDocumentation(path string) { w.WriteString("*/\npackage main // import \"golang.org/x/mobile/cmd/gomobile\"\n") - if err := ioutil.WriteFile(path, w.Bytes(), 0666); err != nil { + if err := os.WriteFile(path, w.Bytes(), 0666); err != nil { log.Fatal(err) } } diff --git a/cmd/gomobile/writer_test.go b/cmd/gomobile/writer_test.go index 345ab28..324659a 100644 --- a/cmd/gomobile/writer_test.go +++ b/cmd/gomobile/writer_test.go @@ -8,7 +8,6 @@ import ( "crypto/x509" "encoding/pem" "io" - "io/ioutil" "os" "os/exec" "testing" @@ -28,7 +27,7 @@ func TestWriter(t *testing.T) { t.Fatal(err) } - f, err := ioutil.TempFile("", "testapk-") + f, err := os.CreateTemp("", "testapk-") if err != nil { t.Fatal(err) } @@ -141,7 +140,7 @@ const androidManifest = ` ` func writeTempFile(data string) (string, error) { - f, err := ioutil.TempFile("", "gofmt") + f, err := os.CreateTemp("", "gofmt") if err != nil { return "", err } diff --git a/exp/f32/gen.go b/exp/f32/gen.go index 2af3327..2679483 100644 --- a/exp/f32/gen.go +++ b/exp/f32/gen.go @@ -16,9 +16,9 @@ import ( "flag" "fmt" "go/format" - "io/ioutil" "log" "math" + "os" ) // N is the number of entries in the sin look-up table. It must be a power of 2. @@ -42,7 +42,7 @@ func main() { if err != nil { log.Fatal(err) } - if err := ioutil.WriteFile(*filename, data, 0644); err != nil { + if err := os.WriteFile(*filename, data, 0644); err != nil { log.Fatal(err) } } diff --git a/exp/font/font_android.go b/exp/font/font_android.go index 3503ec9..bbc0f34 100644 --- a/exp/font/font_android.go +++ b/exp/font/font_android.go @@ -4,12 +4,12 @@ package font -import "io/ioutil" +import "os" func buildDefault() ([]byte, error) { - return ioutil.ReadFile("/system/fonts/DroidSans.ttf") + return os.ReadFile("/system/fonts/DroidSans.ttf") } func buildMonospace() ([]byte, error) { - return ioutil.ReadFile("/system/fonts/DroidSansMono.ttf") + return os.ReadFile("/system/fonts/DroidSansMono.ttf") } diff --git a/exp/font/font_linux.go b/exp/font/font_linux.go index f0beb34..c0f00c8 100644 --- a/exp/font/font_linux.go +++ b/exp/font/font_linux.go @@ -6,13 +6,13 @@ package font -import "io/ioutil" +import "os" func buildDefault() ([]byte, error) { // Try Noto first, but fall back to Droid as the latter was deprecated - noto, nerr := ioutil.ReadFile("/usr/share/fonts/truetype/noto/NotoSans-Regular.ttf") + noto, nerr := os.ReadFile("/usr/share/fonts/truetype/noto/NotoSans-Regular.ttf") if nerr != nil { - if droid, err := ioutil.ReadFile("/usr/share/fonts/truetype/droid/DroidSans.ttf"); err == nil { + if droid, err := os.ReadFile("/usr/share/fonts/truetype/droid/DroidSans.ttf"); err == nil { return droid, nil } } @@ -21,9 +21,9 @@ func buildDefault() ([]byte, error) { func buildMonospace() ([]byte, error) { // Try Noto first, but fall back to Droid as the latter was deprecated - noto, nerr := ioutil.ReadFile("/usr/share/fonts/truetype/noto/NotoMono-Regular.ttf") + noto, nerr := os.ReadFile("/usr/share/fonts/truetype/noto/NotoMono-Regular.ttf") if nerr != nil { - if droid, err := ioutil.ReadFile("/usr/share/fonts/truetype/droid/DroidSansMono.ttf"); err == nil { + if droid, err := os.ReadFile("/usr/share/fonts/truetype/droid/DroidSansMono.ttf"); err == nil { return droid, nil } } diff --git a/exp/sprite/portable/affine_test.go b/exp/sprite/portable/affine_test.go index 4b98e7c..943a812 100644 --- a/exp/sprite/portable/affine_test.go +++ b/exp/sprite/portable/affine_test.go @@ -9,7 +9,6 @@ import ( "image/color" "image/draw" "image/png" - "io/ioutil" "math" "os" "runtime" @@ -147,7 +146,7 @@ func TestAffineMask(t *testing.T) { } func writeTempPNG(prefix string, m image.Image) (string, error) { - f, err := ioutil.TempFile("", prefix+"-") + f, err := os.CreateTemp("", prefix+"-") if err != nil { return "", err } diff --git a/gl/dll_windows.go b/gl/dll_windows.go index 1afc5f8..b7a0d90 100644 --- a/gl/dll_windows.go +++ b/gl/dll_windows.go @@ -10,7 +10,6 @@ import ( "debug/pe" "fmt" "io" - "io/ioutil" "log" "net/http" "os" @@ -18,7 +17,7 @@ import ( "runtime" ) -var debug = log.New(ioutil.Discard, "gl: ", log.LstdFlags) +var debug = log.New(io.Discard, "gl: ", log.LstdFlags) func downloadDLLs() (path string, err error) { url := "https://dl.google.com/go/mobile/angle-bd3f8780b-" + runtime.GOARCH + ".tgz" @@ -54,11 +53,11 @@ func downloadDLLs() (path string, err error) { } switch header.Name { case "angle-" + runtime.GOARCH + "/libglesv2.dll": - bytesGLESv2, err = ioutil.ReadAll(tr) + bytesGLESv2, err = io.ReadAll(tr) case "angle-" + runtime.GOARCH + "/libegl.dll": - bytesEGL, err = ioutil.ReadAll(tr) + bytesEGL, err = io.ReadAll(tr) case "angle-" + runtime.GOARCH + "/d3dcompiler_47.dll": - bytesD3DCompiler, err = ioutil.ReadAll(tr) + bytesD3DCompiler, err = io.ReadAll(tr) default: // skip } if err != nil { @@ -70,13 +69,13 @@ func downloadDLLs() (path string, err error) { } writeDLLs := func(path string) error { - if err := ioutil.WriteFile(filepath.Join(path, "libglesv2.dll"), bytesGLESv2, 0755); err != nil { + if err := os.WriteFile(filepath.Join(path, "libglesv2.dll"), bytesGLESv2, 0755); err != nil { return fmt.Errorf("gl: cannot install ANGLE: %v", err) } - if err := ioutil.WriteFile(filepath.Join(path, "libegl.dll"), bytesEGL, 0755); err != nil { + if err := os.WriteFile(filepath.Join(path, "libegl.dll"), bytesEGL, 0755); err != nil { return fmt.Errorf("gl: cannot install ANGLE: %v", err) } - if err := ioutil.WriteFile(filepath.Join(path, "d3dcompiler_47.dll"), bytesD3DCompiler, 0755); err != nil { + if err := os.WriteFile(filepath.Join(path, "d3dcompiler_47.dll"), bytesD3DCompiler, 0755); err != nil { return fmt.Errorf("gl: cannot install ANGLE: %v", err) } return nil @@ -152,7 +151,7 @@ func chromePath() string { } for _, installdir := range installdirs { - versiondirs, err := ioutil.ReadDir(installdir) + versiondirs, err := os.ReadDir(installdir) if err != nil { continue } diff --git a/gl/gendebug.go b/gl/gendebug.go index 7e3d5a2..b04e3ca 100644 --- a/gl/gendebug.go +++ b/gl/gendebug.go @@ -18,7 +18,6 @@ import ( "go/parser" "go/printer" "go/token" - "io/ioutil" "log" "os" "strconv" @@ -835,7 +834,7 @@ func main() { os.Stdout.Write(b) return } - if err := ioutil.WriteFile(*outfile, b, 0666); err != nil { + if err := os.WriteFile(*outfile, b, 0666); err != nil { die(err) } } diff --git a/internal/binres/binres_test.go b/internal/binres/binres_test.go index 06259b4..fecefac 100644 --- a/internal/binres/binres_test.go +++ b/internal/binres/binres_test.go @@ -10,7 +10,6 @@ import ( "encoding/xml" "errors" "fmt" - "io/ioutil" "log" "math" "os" @@ -108,7 +107,7 @@ func compareBytes(a, b []byte) error { } func TestBootstrap(t *testing.T) { - bin, err := ioutil.ReadFile("testdata/bootstrap.bin") + bin, err := os.ReadFile("testdata/bootstrap.bin") if err != nil { log.Fatal(err) } @@ -218,7 +217,7 @@ func TestEncode(t *testing.T) { t.Fatal(err) } - bin, err := ioutil.ReadFile("testdata/bootstrap.bin") + bin, err := os.ReadFile("testdata/bootstrap.bin") if err != nil { log.Fatal(err) } diff --git a/internal/binres/genarsc.go b/internal/binres/genarsc.go index 7d975cb..f059636 100644 --- a/internal/binres/genarsc.go +++ b/internal/binres/genarsc.go @@ -12,8 +12,8 @@ package main import ( "fmt" - "io/ioutil" "log" + "os" "strconv" "golang.org/x/mobile/internal/binres" @@ -34,7 +34,7 @@ func main() { if err != nil { log.Fatal(err) } - if err := ioutil.WriteFile("arsc.go", []byte(fmt.Sprintf(tmpl, strconv.Quote(string(arsc)))), 0644); err != nil { + if err := os.WriteFile("arsc.go", []byte(fmt.Sprintf(tmpl, strconv.Quote(string(arsc)))), 0644); err != nil { log.Fatal(err) } }