Skip to content

all: replace deprecated ioutil #1659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −24
Open

all: replace deprecated ioutil #1659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions go/ir/source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"go/parser"
"go/token"
"go/types"
"io/ioutil"
"os"
"path/filepath"
"runtime"
Expand All @@ -37,7 +36,7 @@ func TestObjValueLookup(t *testing.T) {
}

conf := loader.Config{ParserMode: parser.ParseComments}
src, err := ioutil.ReadFile(filepath.Join(analysistest.TestData(), "objlookup.go"))
src, err := os.ReadFile(filepath.Join(analysistest.TestData(), "objlookup.go"))
if err != nil {
t.Fatal(err)
}
Expand Down
31 changes: 15 additions & 16 deletions staticcheck/sa1003/testdata/go1.0/CheckEncodingBinary/CheckEncodingBinary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package pkg
import (
"encoding/binary"
"io"
"io/ioutil"
"log"
)

Expand Down Expand Up @@ -40,21 +39,21 @@ func fn() {
var x13 []byte
var x14 *[]byte
var x15 T6
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x1)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x2))
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x3)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x4))
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x5)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x6))
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x7))
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x8)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x9)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x10)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x11))
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, &x13))
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, &x14)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x15))
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, &x15))
log.Println(binary.Write(io.Discard, binary.LittleEndian, x1)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(io.Discard, binary.LittleEndian, x2))
log.Println(binary.Write(io.Discard, binary.LittleEndian, x3)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(io.Discard, binary.LittleEndian, x4))
log.Println(binary.Write(io.Discard, binary.LittleEndian, x5)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(io.Discard, binary.LittleEndian, x6))
log.Println(binary.Write(io.Discard, binary.LittleEndian, x7))
log.Println(binary.Write(io.Discard, binary.LittleEndian, x8)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(io.Discard, binary.LittleEndian, x9)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(io.Discard, binary.LittleEndian, x10)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(io.Discard, binary.LittleEndian, x11))
log.Println(binary.Write(io.Discard, binary.LittleEndian, &x13))
log.Println(binary.Write(io.Discard, binary.LittleEndian, &x14)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(io.Discard, binary.LittleEndian, x15))
log.Println(binary.Write(io.Discard, binary.LittleEndian, &x15))
log.Println(binary.Write(fn2())) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(fn3()))
}
Expand Down
4 changes: 2 additions & 2 deletions staticcheck/sa1003/testdata/go1.7/CheckEncodingBinary/CheckEncodingBinary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package pkg

import (
"encoding/binary"
"io/ioutil"
"io"
"log"
)

func fn() {
var x bool
log.Println(binary.Write(ioutil.Discard, binary.LittleEndian, x)) //@ diag(`cannot be used with binary.Write`)
log.Println(binary.Write(io.Discard, binary.LittleEndian, x)) //@ diag(`cannot be used with binary.Write`)
}
4 changes: 2 additions & 2 deletions staticcheck/sa1003/testdata/go1.8/CheckEncodingBinary/CheckEncodingBinary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package pkg

import (
"encoding/binary"
"io/ioutil"
"io"
)

func fn() {
var x bool
binary.Write(ioutil.Discard, binary.LittleEndian, x)
binary.Write(io.Discard, binary.LittleEndian, x)
}
3 changes: 1 addition & 2 deletions unused/testdata/src/example.com/exported_method_test/exported_method_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package pkg
import (
"bytes"
"io"
"io/ioutil"
"testing"
)

Expand All @@ -21,7 +20,7 @@ func (rs *countReadSeeker) Read(buf []byte) (int, error) { //@ used_test("Read",
func TestFoo(t *testing.T) { //@ used_test("TestFoo", true), used_test("t", true)
r := bytes.NewReader([]byte("Hello, world!")) //@ used_test("r", true)
cr := &countReadSeeker{ReadSeeker: r} //@ used_test("cr", true)
ioutil.ReadAll(cr)
io.ReadAll(cr)
if cr.N != 13 {
t.Errorf("got %d, want 13", cr.N)
}
Expand Down