summaryrefslogtreecommitdiffstats
path: root/modules/charset
diff options
context:
space:
mode:
authorEng Zer Jun <engzerjun@gmail.com>2021-09-22 13:38:34 +0800
committerGitHub <noreply@github.com>2021-09-22 13:38:34 +0800
commitf2e7d5477f076789da5d0e95fe61a56ddb939f5a (patch)
tree922ca8769761c30e93f3b4deaf27858026b27ebf /modules/charset
parentaa631d8cd18251aa9b18ce72f75c8d8c7090e5e7 (diff)
downloadgitea-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 'modules/charset')
-rw-r--r--modules/charset/charset.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/charset/charset.go b/modules/charset/charset.go
index 3000864c2e..47906e2638 100644
--- a/modules/charset/charset.go
+++ b/modules/charset/charset.go
@@ -8,7 +8,6 @@ import (
"bytes"
"fmt"
"io"
- "io/ioutil"
"strings"
"unicode/utf8"
@@ -78,7 +77,7 @@ func ToUTF8WithErr(content []byte) (string, error) {
// ToUTF8WithFallback detects the encoding of content and coverts to UTF-8 if possible
func ToUTF8WithFallback(content []byte) []byte {
- bs, _ := ioutil.ReadAll(ToUTF8WithFallbackReader(bytes.NewReader(content)))
+ bs, _ := io.ReadAll(ToUTF8WithFallbackReader(bytes.NewReader(content)))
return bs
}