mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 01:34:27 +00:00 
			
		
		
		
	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>
This commit is contained in:
		@@ -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{
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user