Fix staticcheck warning for io/ioutil deprecation
diff --git a/logger.go b/logger.go index 0c478be..917644f 100644 --- a/logger.go +++ b/logger.go
@@ -5,7 +5,7 @@ package subcommands import ( - "io/ioutil" + "io" "log" ) @@ -27,5 +27,5 @@ // VoidStdLog sets an output that will be ignored. This permits ignoring any // log.*() calls that would inhibit efficient use of t.Parallel(). func VoidStdLog() { - log.SetOutput(ioutil.Discard) + log.SetOutput(io.Discard) }
diff --git a/sample-complex/main.go b/sample-complex/main.go index 39e4384..c75202e 100644 --- a/sample-complex/main.go +++ b/sample-complex/main.go
@@ -8,7 +8,7 @@ import ( "flag" - "io/ioutil" + "io" "log" "os" @@ -68,6 +68,6 @@ func main() { subcommands.KillStdLog() - s := &sampleComplexApplication{application, log.New(ioutil.Discard, "", log.LstdFlags|log.Lmicroseconds)} + s := &sampleComplexApplication{application, log.New(io.Discard, "", log.LstdFlags|log.Lmicroseconds)} os.Exit(subcommands.Run(s, nil)) }
diff --git a/sample-simple/main_test.go b/sample-simple/main_test.go index eb70421..06584a8 100644 --- a/sample-simple/main_test.go +++ b/sample-simple/main_test.go
@@ -5,7 +5,7 @@ package main import ( - "io/ioutil" + "io" "log" "os" "testing" @@ -20,7 +20,7 @@ // TODO(maruel): Create an in-memory os.File, couldn't quickly find a ready // made fake only. func newTempFile(t testing.TB) *os.File { - f, err := ioutil.TempFile("", "sample-simple") + f, err := os.CreateTemp("", "sample-simple") ut.AssertEqual(t, nil, err) return f } @@ -38,7 +38,7 @@ func assertStdout(t testing.TB, expected string) { _, _ = os.Stdout.Seek(0, 0) - actual, err := ioutil.ReadAll(os.Stdout) + actual, err := io.ReadAll(os.Stdout) ut.AssertEqual(t, nil, err) ut.AssertEqual(t, expected, string(actual)) }