diff --git a/cmdutil/run.go b/cmdutil/run.go index d0823a4..3656d78 100644 --- a/cmdutil/run.go +++ b/cmdutil/run.go @@ -2,7 +2,7 @@ package cmdutil import ( "fmt" - "io/ioutil" + "io" "os" "os/exec" "strings" @@ -22,8 +22,8 @@ func Run(command string, args ...string) error { // RunSilently runs the command silently func RunSilently(command string, args ...string) error { cmd := exec.Command(command, args...) - cmd.Stdout = ioutil.Discard - cmd.Stderr = ioutil.Discard + cmd.Stdout = io.Discard + cmd.Stderr = io.Discard return RunCommand(cmd, true) } @@ -41,8 +41,8 @@ func RunInDir(dir, command string, args ...string) error { // RunInDirSilently run the command in the specified directory silently func RunInDirSilently(dir, command string, args ...string) error { cmd := exec.Command(command, args...) - cmd.Stdout = ioutil.Discard - cmd.Stderr = ioutil.Discard + cmd.Stdout = io.Discard + cmd.Stderr = io.Discard cmd.Dir = dir return RunCommand(cmd, true) diff --git a/helpers_test.go b/helpers_test.go index 6602986..e986171 100644 --- a/helpers_test.go +++ b/helpers_test.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "io/ioutil" + "io" "net/url" "os" "testing" @@ -55,12 +55,12 @@ func capture(block func()) (string, string, error) { defer rOut.Close() defer rErr.Close() - bufOut, err := ioutil.ReadAll(rOut) + bufOut, err := io.ReadAll(rOut) if err != nil { return "", "", err } - bufErr, err := ioutil.ReadAll(rErr) + bufErr, err := io.ReadAll(rErr) if err != nil { return "", "", err } @@ -85,7 +85,7 @@ func captureWithInput(in []string, block func()) (string, string, error) { } func newTempDir(t *testing.T) string { - tmpdir, err := ioutil.TempDir("", "ghq-test") + tmpdir, err := os.MkdirTemp("", "ghq-test") if err != nil { t.Fatal(err) } diff --git a/vcs.go b/vcs.go index 27ab637..ddbb07b 100644 --- a/vcs.go +++ b/vcs.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" + "io" "net/url" "os" "os/exec" @@ -190,7 +190,7 @@ var GitsvnBackend = &VCSBackend{ buf := &bytes.Buffer{} cmd := exec.Command("svn", "info", u) cmd.Stdout = buf - cmd.Stderr = ioutil.Discard + cmd.Stderr = io.Discard err := cmdutil.RunCommand(cmd, true) return buf.String(), err }