utils-code/x-motemen.ghq
1
0
Fork 0
mirror of https://github.com/x-motemen/ghq.git synced 2026-09-10 07:26:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

migrate io/ioutil

Browse source
This commit is contained in:
Ichinose Shogo 2022-05-02 22:52:49 +09:00
parent 84cff8fc83
commit 55ee979169
No known key found for this signature in database
GPG key ID: E6BE27F39196B3F3
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmdutil/run.go
View file

@ -2,7 +2,7 @@ package cmdutil
import ( import (
"fmt" "fmt"
"io/ioutil" "io"
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
@ -22,8 +22,8 @@ func Run(command string, args ...string) error {
// RunSilently runs the command silently // RunSilently runs the command silently
func RunSilently(command string, args ...string) error { func RunSilently(command string, args ...string) error {
cmd := exec.Command(command, args...) cmd := exec.Command(command, args...)
cmd.Stdout = ioutil.Discard cmd.Stdout = io.Discard
cmd.Stderr = ioutil.Discard cmd.Stderr = io.Discard
return RunCommand(cmd, true) 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 // RunInDirSilently run the command in the specified directory silently
func RunInDirSilently(dir, command string, args ...string) error { func RunInDirSilently(dir, command string, args ...string) error {
cmd := exec.Command(command, args...) cmd := exec.Command(command, args...)
cmd.Stdout = ioutil.Discard cmd.Stdout = io.Discard
cmd.Stderr = ioutil.Discard cmd.Stderr = io.Discard
cmd.Dir = dir cmd.Dir = dir
return RunCommand(cmd, true) return RunCommand(cmd, true)

8
helpers_test.go
View file

@ -2,7 +2,7 @@ package main
import ( import (
"fmt" "fmt"
"io/ioutil" "io"
"net/url" "net/url"
"os" "os"
"testing" "testing"
@ -55,12 +55,12 @@ func capture(block func()) (string, string, error) {
defer rOut.Close() defer rOut.Close()
defer rErr.Close() defer rErr.Close()
bufOut, err := ioutil.ReadAll(rOut) bufOut, err := io.ReadAll(rOut)
if err != nil { if err != nil {
return "", "", err return "", "", err
} }
bufErr, err := ioutil.ReadAll(rErr) bufErr, err := io.ReadAll(rErr)
if err != nil { if err != nil {
return "", "", err return "", "", err
} }
@ -85,7 +85,7 @@ func captureWithInput(in []string, block func()) (string, string, error) {
} }
func newTempDir(t *testing.T) string { func newTempDir(t *testing.T) string {
tmpdir, err := ioutil.TempDir("", "ghq-test") tmpdir, err := os.MkdirTemp("", "ghq-test")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

4
vcs.go
View file

@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io"
"net/url" "net/url"
"os" "os"
"os/exec" "os/exec"
@ -190,7 +190,7 @@ var GitsvnBackend = &VCSBackend{
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
cmd := exec.Command("svn", "info", u) cmd := exec.Command("svn", "info", u)
cmd.Stdout = buf cmd.Stdout = buf
cmd.Stderr = ioutil.Discard cmd.Stderr = io.Discard
err := cmdutil.RunCommand(cmd, true) err := cmdutil.RunCommand(cmd, true)
return buf.String(), err return buf.String(), err
} }