lianguan/gitea
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki 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
103 changed files with 261 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/gitdiff/gitdiff.go
View File

@ -13,7 +13,6 @@ import (
"html"
"html/template"
"io"
"io/ioutil"
"net/url"
"os"
"os/exec"
@ -721,7 +720,7 @@ parsingLoop:
// TODO: Handle skipping first n files
if len(diff.Files) >= maxFiles {
diff.IsIncomplete = true
_, err := io.Copy(ioutil.Discard, reader)
_, err := io.Copy(io.Discard, reader)
if err != nil {
// By the definition of io.Copy this never returns io.EOF
return diff, fmt.Errorf("Copy: %v", err)
@ -1280,7 +1279,7 @@ func GetDiffRangeWithWhitespaceBehavior(gitRepo *git.Repository, beforeCommitID,
indexFilename, deleteTemporaryFile, err := gitRepo.ReadTreeToTemporaryIndex(afterCommitID)
if err == nil {
defer deleteTemporaryFile()
workdir, err := ioutil.TempDir("", "empty-work-dir")
workdir, err := os.MkdirTemp("", "empty-work-dir")
if err != nil {
log.Error("Unable to create temporary directory: %v", err)
return nil, err