summaryrefslogtreecommitdiffstats
path: root/modules/git/blob_nogogit.go
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/git/blob_nogogit.go
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/git/blob_nogogit.go')
-rw-r--r--modules/git/blob_nogogit.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/git/blob_nogogit.go b/modules/git/blob_nogogit.go
index 3391bc3931..65a73ebc52 100644
--- a/modules/git/blob_nogogit.go
+++ b/modules/git/blob_nogogit.go
@@ -11,7 +11,6 @@ import (
"bufio"
"bytes"
"io"
- "io/ioutil"
"math"
"code.gitea.io/gitea/modules/log"
@@ -46,13 +45,13 @@ func (b *Blob) DataAsync() (io.ReadCloser, error) {
b.size = size
if size < 4096 {
- bs, err := ioutil.ReadAll(io.LimitReader(rd, size))
+ bs, err := io.ReadAll(io.LimitReader(rd, size))
defer cancel()
if err != nil {
return nil, err
}
_, err = rd.Discard(1)
- return ioutil.NopCloser(bytes.NewReader(bs)), err
+ return io.NopCloser(bytes.NewReader(bs)), err
}
return &blobReader{