History

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>

Eng Zer Jun committed 5 years ago

Commit f2e7d541 parent aa631d8103 files · +261 −314Browse files

Showing the changes to services/gitdiff/gitdiff.go (1 of 103 files). Show all

Unified · Split

services/gitdiff/gitdiff.go+2−3
@@ -13,7 +13,6 @@ import ( · 12 unmodified lines
13 "html"13 "html"
14 "html/template"14 "html/template"
15 "io"15 "io"
16 "io/ioutil"
17 "net/url"16 "net/url"
18 "os"17 "os"
19 "os/exec"18 "os/exec"
@@ -721,7 +720,7 @@ parsingLoop: · 701 unmodified lines
721 // TODO: Handle skipping first n files720 // TODO: Handle skipping first n files
722 if len(diff.Files) >= maxFiles {721 if len(diff.Files) >= maxFiles {
723 diff.IsIncomplete = true722 diff.IsIncomplete = true
724 _, err := io.Copy(ioutil.Discard, reader)723 _, err := io.Copy(io.Discard, reader)
725 if err != nil {724 if err != nil {
726 // By the definition of io.Copy this never returns io.EOF725 // By the definition of io.Copy this never returns io.EOF
727 return diff, fmt.Errorf("Copy: %v", err)726 return diff, fmt.Errorf("Copy: %v", err)
@@ -1280,7 +1279,7 @@ func GetDiffRangeWithWhitespaceBehavior(gitRepo *git.Repository, beforeCommitID, · 552 unmodified lines
1280 indexFilename, deleteTemporaryFile, err := gitRepo.ReadTreeToTemporaryIndex(afterCommitID)1279 indexFilename, deleteTemporaryFile, err := gitRepo.ReadTreeToTemporaryIndex(afterCommitID)
1281 if err == nil {1280 if err == nil {
1282 defer deleteTemporaryFile()1281 defer deleteTemporaryFile()
1283 workdir, err := ioutil.TempDir("", "empty-work-dir")1282 workdir, err := os.MkdirTemp("", "empty-work-dir")
1284 if err != nil {1283 if err != nil {
1285 log.Error("Unable to create temporary directory: %v", err)1284 log.Error("Unable to create temporary directory: %v", err)
1286 return nil, err1285 return nil, err