diff options
| author | Eng Zer Jun <engzerjun@gmail.com> | 2021-09-22 13:38:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 13:38:34 +0800 |
| commit | f2e7d5477f076789da5d0e95fe61a56ddb939f5a (patch) | |
| tree | 922ca8769761c30e93f3b4deaf27858026b27ebf /services/pull/patch.go | |
| parent | aa631d8cd18251aa9b18ce72f75c8d8c7090e5e7 (diff) | |
| download | gitea-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 'services/pull/patch.go')
| -rw-r--r-- | services/pull/patch.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/pull/patch.go b/services/pull/patch.go index 73b979f647..184da9f659 100644 --- a/services/pull/patch.go +++ b/services/pull/patch.go @@ -10,7 +10,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "os" "strings" @@ -100,7 +99,7 @@ func TestPatch(pr *models.PullRequest) error { func checkConflicts(pr *models.PullRequest, gitRepo *git.Repository, tmpBasePath string) (bool, error) { // 1. Create a plain patch from head to base - tmpPatchFile, err := ioutil.TempFile("", "patch") + tmpPatchFile, err := os.CreateTemp("", "patch") if err != nil { log.Error("Unable to create temporary patch file! Error: %v", err) return false, fmt.Errorf("Unable to create temporary patch file! Error: %v", err) |