tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-16 18:53:29 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

refactor: rm io/ioutil funcs

Browse Source 
io/ioutil has been deprecated since Go 1.16
https://pkg.go.dev/io/ioutil

Signed-off-by: ginglis13 <ginglis05@gmail.com>
This commit is contained in:
ginglis13
2023-10-14 10:19:38 -07:00
committed by Ron Evans
parent dde9b5ad3a
commit 8d77278c6b
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loader/goroot.go
+2 -3
View File
@@ -18,7 +18,6 @@ import (
"errors" "errors"
"io" "io"
"io/fs" "io/fs"
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path" "path"
@@ -157,7 +156,7 @@ func listGorootMergeLinks(goroot, tinygoroot string, overrides map[string]bool)
// Add files from TinyGo. // Add files from TinyGo.
tinygoDir := filepath.Join(tinygoSrc, dir) tinygoDir := filepath.Join(tinygoSrc, dir)
tinygoEntries, err := ioutil.ReadDir(tinygoDir) tinygoEntries, err := os.ReadDir(tinygoDir)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -177,7 +176,7 @@ func listGorootMergeLinks(goroot, tinygoroot string, overrides map[string]bool)
// Add all directories from $GOROOT that are not part of the TinyGo // Add all directories from $GOROOT that are not part of the TinyGo
// overrides. // overrides.
goDir := filepath.Join(goSrc, dir) goDir := filepath.Join(goSrc, dir)
goEntries, err := ioutil.ReadDir(goDir) goEntries, err := os.ReadDir(goDir)
if err != nil { if err != nil {
return nil, err return nil, err
} }
main.go
+8 -3
View File
@@ -11,7 +11,6 @@ import (
"go/scanner" "go/scanner"
"go/types" "go/types"
"io" "io"
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"os/signal" "os/signal"
@@ -1736,14 +1735,20 @@ func main() {
handleCompilerError(err) handleCompilerError(err)
case "targets": case "targets":
dir := filepath.Join(goenv.Get("TINYGOROOT"), "targets") dir := filepath.Join(goenv.Get("TINYGOROOT"), "targets")
entries, err := ioutil.ReadDir(dir) entries, err := os.ReadDir(dir)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, "could not list targets:", err) fmt.Fprintln(os.Stderr, "could not list targets:", err)
os.Exit(1) os.Exit(1)
return return
} }
for _, entry := range entries { for _, entry := range entries {
if !entry.Mode().IsRegular() || !strings.HasSuffix(entry.Name(), ".json") { entryInfo, err := entry.Info()
if err != nil {
fmt.Fprintln(os.Stderr, "could not get entry info:", err)
os.Exit(1)
return
}
if !entryInfo.Mode().IsRegular() || !strings.HasSuffix(entry.Name(), ".json") {
// Only inspect JSON files. // Only inspect JSON files.
continue continue
} }