diff options
author | Eng Zer Jun <engzerjun@gmail.com> | 2021-09-22 13:38:34 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-22 13:38:34 +0800 |
commit | f2e7d5477f076789da5d0e95fe61a56ddb939f5a (patch) | |
tree | 922ca8769761c30e93f3b4deaf27858026b27ebf /build | |
parent | aa631d8cd18251aa9b18ce72f75c8d8c7090e5e7 (diff) | |
download | gitea-f2e7d5477f076789da5d0e95fe61a56ddb939f5a.tar.gz gitea-f2e7d5477f076789da5d0e95fe61a56ddb939f5a.zip |
refactor: move from io/ioutil to io and os package (#17109)
The io/ioutil package has been deprecated as of Go 1.16, see
https://golang.org/doc/go1.16#ioutil. This commit replaces the existing
io/ioutil functions with their new definitions in io and os packages.
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'build')
-rw-r--r-- | build/generate-bindata.go | 5 | ||||
-rw-r--r-- | build/generate-emoji.go | 9 | ||||
-rw-r--r-- | build/generate-gitignores.go | 7 | ||||
-rw-r--r-- | build/generate-licenses.go | 3 |
4 files changed, 11 insertions, 13 deletions
diff --git a/build/generate-bindata.go b/build/generate-bindata.go index efd172f779..477139d67b 100644 --- a/build/generate-bindata.go +++ b/build/generate-bindata.go @@ -11,7 +11,6 @@ import ( "bytes" "crypto/sha1" "fmt" - "io/ioutil" "log" "net/http" "os" @@ -28,7 +27,7 @@ func needsUpdate(dir string, filename string) (bool, []byte) { needRegen = true } - oldHash, err := ioutil.ReadFile(filename + ".hash") + oldHash, err := os.ReadFile(filename + ".hash") if err != nil { oldHash = []byte{} } @@ -83,5 +82,5 @@ func main() { if err != nil { log.Fatalf("%v\n", err) } - _ = ioutil.WriteFile(filename+".hash", newHash, 0666) + _ = os.WriteFile(filename+".hash", newHash, 0666) } diff --git a/build/generate-emoji.go b/build/generate-emoji.go index da4e12373c..aa56d45f74 100644 --- a/build/generate-emoji.go +++ b/build/generate-emoji.go @@ -12,9 +12,10 @@ import ( "flag" "fmt" "go/format" - "io/ioutil" + "io" "log" "net/http" + "os" "regexp" "sort" "strconv" @@ -67,7 +68,7 @@ func main() { } // write - err = ioutil.WriteFile(*flagOut, buf, 0644) + err = os.WriteFile(*flagOut, buf, 0644) if err != nil { log.Fatal(err) } @@ -96,7 +97,7 @@ func generate() ([]byte, error) { defer res.Body.Close() // read all - body, err := ioutil.ReadAll(res.Body) + body, err := io.ReadAll(res.Body) if err != nil { return nil, err } @@ -157,7 +158,7 @@ func generate() ([]byte, error) { // write a JSON file to use with tribute (write before adding skin tones since we can't support them there yet) file, _ := json.Marshal(data) - _ = ioutil.WriteFile("assets/emoji.json", file, 0644) + _ = os.WriteFile("assets/emoji.json", file, 0644) // Add skin tones to emoji that support it var ( diff --git a/build/generate-gitignores.go b/build/generate-gitignores.go index d0b972e803..811953ee4a 100644 --- a/build/generate-gitignores.go +++ b/build/generate-gitignores.go @@ -9,7 +9,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "net/http" "os" @@ -34,7 +33,7 @@ func main() { flag.StringVar(&githubApiToken, "token", "", "github api token") flag.Parse() - file, err := ioutil.TempFile(os.TempDir(), prefix) + file, err := os.CreateTemp(os.TempDir(), prefix) if err != nil { log.Fatalf("Failed to create temp file. %s", err) @@ -114,13 +113,13 @@ func main() { for dst, src := range filesToCopy { // Read all content of src to data src = path.Join(destination, src) - data, err := ioutil.ReadFile(src) + data, err := os.ReadFile(src) if err != nil { log.Fatalf("Failed to read src file. %s", err) } // Write data to dst dst = path.Join(destination, dst) - err = ioutil.WriteFile(dst, data, 0644) + err = os.WriteFile(dst, data, 0644) if err != nil { log.Fatalf("Failed to write new file. %s", err) } diff --git a/build/generate-licenses.go b/build/generate-licenses.go index 4009a0351d..75fb7cc810 100644 --- a/build/generate-licenses.go +++ b/build/generate-licenses.go @@ -9,7 +9,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "net/http" "os" @@ -34,7 +33,7 @@ func main() { flag.StringVar(&githubApiToken, "token", "", "github api token") flag.Parse() - file, err := ioutil.TempFile(os.TempDir(), prefix) + file, err := os.CreateTemp(os.TempDir(), prefix) if err != nil { log.Fatalf("Failed to create temp file. %s", err) |