aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorEng Zer Jun2021-09-22 13:38:34 +0800
committerGitHub2021-09-22 13:38:34 +0800
commitf2e7d5477f076789da5d0e95fe61a56ddb939f5a (patch)
tree922ca8769761c30e93f3b4deaf27858026b27ebf /contrib
parentaa631d8cd18251aa9b18ce72f75c8d8c7090e5e7 (diff)
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 'contrib')
-rw-r--r--contrib/fixtures/fixture_generation.go3
-rw-r--r--contrib/pr/checkout.go9
2 files changed, 5 insertions, 7 deletions
diff --git a/contrib/fixtures/fixture_generation.go b/contrib/fixtures/fixture_generation.go
index 1665dab64..5408a005c 100644
--- a/contrib/fixtures/fixture_generation.go
+++ b/contrib/fixtures/fixture_generation.go
@@ -6,7 +6,6 @@ package main
import (
"fmt"
- "io/ioutil"
"os"
"path/filepath"
@@ -65,7 +64,7 @@ func generate(name string) error {
return err
}
path := filepath.Join(fixturesDir, name+".yml")
- if err := ioutil.WriteFile(path, []byte(data), 0644); err != nil {
+ if err := os.WriteFile(path, []byte(data), 0644); err != nil {
return fmt.Errorf("%s: %+v", path, err)
}
fmt.Printf("%s created.\n", path)
diff --git a/contrib/pr/checkout.go b/contrib/pr/checkout.go
index 44c3fd517..cba6d4d37 100644
--- a/contrib/pr/checkout.go
+++ b/contrib/pr/checkout.go
@@ -12,7 +12,6 @@ import (
"context"
"flag"
"fmt"
- "io/ioutil"
"log"
"net/http"
"net/url"
@@ -52,11 +51,11 @@ func runPR() {
setting.SetCustomPathAndConf("", "", "")
setting.NewContext()
- setting.RepoRootPath, err = ioutil.TempDir(os.TempDir(), "repos")
+ setting.RepoRootPath, err = os.MkdirTemp(os.TempDir(), "repos")
if err != nil {
log.Fatalf("TempDir: %v\n", err)
}
- setting.AppDataPath, err = ioutil.TempDir(os.TempDir(), "appdata")
+ setting.AppDataPath, err = os.MkdirTemp(os.TempDir(), "appdata")
if err != nil {
log.Fatalf("TempDir: %v\n", err)
}
@@ -181,7 +180,7 @@ func main() {
codeFilePath = filepath.FromSlash(codeFilePath) //Convert to running OS
//Copy this file if it will not exist in the PR branch
- dat, err := ioutil.ReadFile(codeFilePath)
+ dat, err := os.ReadFile(codeFilePath)
if err != nil {
log.Fatalf("Failed to cache this code file : %v", err)
}
@@ -245,7 +244,7 @@ func main() {
if err != nil {
log.Fatalf("Failed to duplicate this code file in PR : %v", err)
}
- err = ioutil.WriteFile(codeFilePath, dat, 0644)
+ err = os.WriteFile(codeFilePath, dat, 0644)
if err != nil {
log.Fatalf("Failed to duplicate this code file in PR : %v", err)
}