Skip to content

Commit 7c367bb

Browse files
Merge pull request #1684 from alexandear/refactor-replace-deprecated-ioutil
Replace deprecated io/ioutil with io and os
2 parents e6a990c + 014ae9a commit 7c367bb

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

_codegen/main.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"go/token"
1717
"go/types"
1818
"io"
19-
"io/ioutil"
2019
"log"
2120
"os"
2221
"path"
@@ -101,7 +100,7 @@ func parseTemplates() (*template.Template, *template.Template, error) {
101100
return nil, nil, err
102101
}
103102
if *tmplFile != "" {
104-
f, err := ioutil.ReadFile(*tmplFile)
103+
f, err := os.ReadFile(*tmplFile)
105104
if err != nil {
106105
return nil, nil, err
107106
}
@@ -183,7 +182,7 @@ func parsePackageSource(pkg string) (*types.Scope, *doc.Package, error) {
183182
files := make(map[string]*ast.File)
184183
fileList := make([]*ast.File, len(pd.GoFiles))
185184
for i, fname := range pd.GoFiles {
186-
src, err := ioutil.ReadFile(path.Join(pd.Dir, fname))
185+
src, err := os.ReadFile(path.Join(pd.Dir, fname))
187186
if err != nil {
188187
return nil, nil, err
189188
}

suite/suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"errors"
66
"flag"
7-
"io/ioutil"
7+
"io"
88
"math/rand"
99
"os"
1010
"os/exec"
@@ -440,7 +440,7 @@ func (sc *StdoutCapture) StopCapture() (string, error) {
440440
}
441441
os.Stdout.Close()
442442
os.Stdout = sc.oldStdout
443-
bytes, err := ioutil.ReadAll(sc.readPipe)
443+
bytes, err := io.ReadAll(sc.readPipe)
444444
if err != nil {
445445
return "", err
446446
}

0 commit comments

Comments
 (0)