domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

refactor: move from io/ioutil to io and os package (#17109)

Browse source 
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>
This commit is contained in:
Eng Zer Jun 2021-09-22 13:38:34 +08:00 • committed by GitHub
parent aa631d8cd1
commit f2e7d5477f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
103 changed files with 261 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/options/static.go
View file

@ -9,7 +9,8 @@ package options
import (
"fmt"
"io/ioutil"
"io"
"os"
"path"
"code.gitea.io/gitea/modules/log"
@ -109,7 +110,7 @@ func fileFromDir(name string) ([]byte, error) {
log.Error("Unable to check if %s is a file. Error: %v", customPath, err)
}
if isFile {
return ioutil.ReadFile(customPath)
return os.ReadFile(customPath)
}
f, err := Assets.Open(name)
@ -118,7 +119,7 @@ func fileFromDir(name string) ([]byte, error) {
}
defer f.Close()
return ioutil.ReadAll(f)
return io.ReadAll(f)
}
func Asset(name string) ([]byte, error) {
@ -127,7 +128,7 @@ func Asset(name string) ([]byte, error) {
return nil, err
}
defer f.Close()
return ioutil.ReadAll(f)
return io.ReadAll(f)
}
func AssetNames() []string {