Skip to content

Commit 4e91c16

Browse files
12ya12ya
committed
cleanup codebase
1 parent 4fbd317 commit 4e91c16

File tree

17 files changed

+38
-46
lines changed

17 files changed

+38
-46
lines changed

‎arm/armasm/decode_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ package armasm
66

77
import (
88
"encoding/hex"
9-
"io/ioutil"
9+
"os"
1010
"strconv"
1111
"strings"
1212
"testing"
1313
)
1414

1515
func TestDecode(t *testing.T) {
16-
data, err := ioutil.ReadFile("testdata/decode.txt")
16+
data, err := os.ReadFile("testdata/decode.txt")
1717
if err != nil {
1818
t.Fatal(err)
1919
}

‎arm/armasm/ext_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"flag"
1515
"fmt"
1616
"io"
17-
"io/ioutil"
1817
"log"
1918
"math/rand"
2019
"os"
@@ -190,7 +189,7 @@ const start = 0x8000 // start address of text
190189
// starting at offset start. That file is intended to be the input to
191190
// the external disassembler.
192191
func writeInst(generate func(func([]byte))) (file string, f *os.File, size int, err error) {
193-
f, err = ioutil.TempFile("", "armasm")
192+
f, err = os.CreateTemp("", "armasm")
194193
if err != nil {
195194
return
196195
}
@@ -568,7 +567,7 @@ func hexCases(t *testing.T, encoded string) func(func([]byte)) {
568567
// It only uses the inputs; it ignores the answers recorded in that file.
569568
func testdataCases(t *testing.T) func(func([]byte)) {
570569
var codes [][]byte
571-
data, err := ioutil.ReadFile("testdata/decode.txt")
570+
data, err := os.ReadFile("testdata/decode.txt")
572571
if err != nil {
573572
t.Fatal(err)
574573
}

‎arm/armspec/specmap.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package main
99
import (
1010
"encoding/json"
1111
"fmt"
12-
"io/ioutil"
1312
"log"
1413
"os"
1514
"regexp"
@@ -33,7 +32,7 @@ type Inst struct {
3332
}
3433

3534
func main() {
36-
data, err := ioutil.ReadFile("spec.json")
35+
data, err := os.ReadFile("spec.json")
3736
if err != nil {
3837
log.Fatal(err)
3938
}

‎arm64/arm64asm/decode_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ package arm64asm
66

77
import (
88
"encoding/hex"
9-
"io/ioutil"
9+
"os"
1010
"path/filepath"
1111
"strings"
1212
"testing"
1313
)
1414

1515
func testDecode(t *testing.T, syntax string) {
1616
input := filepath.Join("testdata", syntax+"cases.txt")
17-
data, err := ioutil.ReadFile(input)
17+
data, err := os.ReadFile(input)
1818
if err != nil {
1919
t.Fatal(err)
2020
}

‎arm64/arm64asm/ext_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"flag"
1616
"fmt"
1717
"io"
18-
"io/ioutil"
1918
"log"
2019
"math/rand"
2120
"os"
@@ -214,7 +213,7 @@ const start = 0x8000
214213
// starting at offset start. That file is intended to be the input to
215214
// the external disassembler.
216215
func writeInst(generate func(func([]byte))) (file string, f *os.File, size int, err error) {
217-
f, err = ioutil.TempFile("", "arm64asm")
216+
f, err = os.CreateTemp("", "arm64asm")
218217
if err != nil {
219218
return
220219
}
@@ -501,7 +500,7 @@ func doFuzzy(inst *InstJson, Ninst int) {
501500
// JSONCases generates ARM64 instructions according to inst.json.
502501
func JSONCases(t *testing.T) func(func([]byte)) {
503502
return func(try func([]byte)) {
504-
data, err := ioutil.ReadFile("inst.json")
503+
data, err := os.ReadFile("inst.json")
505504
if err != nil {
506505
t.Fatal(err)
507506
}
@@ -565,7 +564,7 @@ func hexCases(t *testing.T, encoded string) func(func([]byte)) {
565564
func testdataCases(t *testing.T, syntax string) func(func([]byte)) {
566565
var codes [][]byte
567566
input := filepath.Join("testdata", syntax+"cases.txt")
568-
data, err := ioutil.ReadFile(input)
567+
data, err := os.ReadFile(input)
569568
if err != nil {
570569
t.Fatal(err)
571570
}

‎arm64/arm64gen/sysreggen.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"encoding/xml"
2323
"flag"
2424
"fmt"
25-
"io/ioutil"
25+
"io"
2626
"log"
2727
"os"
2828
"path/filepath"
@@ -124,7 +124,7 @@ func main() {
124124
check(err)
125125
defer out.Close()
126126

127-
files, err := ioutil.ReadDir(*xmlfolder)
127+
files, err := os.ReadDir(*xmlfolder)
128128
check(err)
129129

130130
var systemregs []SystemReg
@@ -133,7 +133,7 @@ func main() {
133133
for _, file := range files {
134134
xmlFile, err := os.Open(filepath.Join(*xmlfolder, file.Name()))
135135
check(err)
136-
value, err := ioutil.ReadAll(xmlFile)
136+
value, err := io.ReadAll(xmlFile)
137137
check(err)
138138

139139
var regpage RegisterPage

‎loong64/loong64asm/decode_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ package loong64asm
66

77
import (
88
"encoding/hex"
9-
"io/ioutil"
9+
"os"
1010
"path/filepath"
1111
"strings"
1212
"testing"
1313
)
1414

1515
func testDecode(t *testing.T, syntax string) {
1616
input := filepath.Join("testdata", syntax+"cases.txt")
17-
data, err := ioutil.ReadFile(input)
17+
data, err := os.ReadFile(input)
1818
if err != nil {
1919
t.Fatal(err)
2020
}

‎loong64/loong64asm/ext_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"flag"
1414
"fmt"
1515
"io"
16-
"io/ioutil"
1716
"log"
1817
"math/rand"
1918
"os"
@@ -187,7 +186,7 @@ const start = 0x8000
187186
// starting at offset start. That file is intended to be the input to
188187
// the external disassembler.
189188
func writeInst(generate func(func([]byte))) (file string, f *os.File, size int, err error) {
190-
f, err = ioutil.TempFile("", "loong64asm")
189+
f, err = os.CreateTemp("", "loong64asm")
191190
if err != nil {
192191
return
193192
}
@@ -371,7 +370,7 @@ func hexCases(t *testing.T, encoded string) func(func([]byte)) {
371370
func testdataCases(t *testing.T, syntax string) func(func([]byte)) {
372371
var codes [][]byte
373372
input := filepath.Join("testdata", syntax+"cases.txt")
374-
data, err := ioutil.ReadFile(input)
373+
data, err := os.ReadFile(input)
375374
if err != nil {
376375
t.Fatal(err)
377376
}

‎ppc64/ppc64asm/decode_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ package ppc64asm
77
import (
88
"encoding/binary"
99
"encoding/hex"
10-
"io/ioutil"
10+
"os"
1111
"path"
1212
"strings"
1313
"testing"
1414
)
1515

1616
func TestDecode(t *testing.T) {
17-
files, err := ioutil.ReadDir("testdata")
17+
files, err := os.ReadDir("testdata")
1818
if err != nil {
1919
t.Fatal(err)
2020
}
@@ -23,7 +23,7 @@ func TestDecode(t *testing.T) {
2323
continue
2424
}
2525
filename := path.Join("testdata", f.Name())
26-
data, err := ioutil.ReadFile(filename)
26+
data, err := os.ReadFile(filename)
2727
if err != nil {
2828
t.Fatal(err)
2929
}

‎ppc64/ppc64asm/ext_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"flag"
1616
"fmt"
1717
"io"
18-
"io/ioutil"
1918
"log"
2019
"math/rand"
2120
"os"
@@ -188,7 +187,7 @@ const start = 0x8000 // start address of text
188187
// starting at offset start. That file is intended to be the input to
189188
// the external disassembler.
190189
func writeInst(generate func(func([]byte))) (file string, f *os.File, size int, err error) {
191-
f, err = ioutil.TempFile("", "ppc64asm")
190+
f, err = os.CreateTemp("", "ppc64asm")
192191
if err != nil {
193192
return
194193
}
@@ -494,7 +493,7 @@ func hexCases(t *testing.T, encoded string) func(func([]byte)) {
494493
// It only uses the inputs; it ignores the answers recorded in that file.
495494
func testdataCases(t *testing.T) func(func([]byte)) {
496495
var codes [][]byte
497-
data, err := ioutil.ReadFile("testdata/decode.txt")
496+
data, err := os.ReadFile("testdata/decode.txt")
498497
if err != nil {
499498
t.Fatal(err)
500499
}

‎riscv64/riscv64asm/ext_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"flag"
1414
"fmt"
1515
"io"
16-
"io/ioutil"
1716
"log"
1817
"math/rand"
1918
"os"
@@ -189,7 +188,7 @@ const start = 0x8000
189188
// starting at offset start. That file is intended to be the input to
190189
// the external disassembler.
191190
func writeInst(generate func(func([]byte))) (file string, f *os.File, size int, err error) {
192-
f, err = ioutil.TempFile("", "riscv64asm")
191+
f, err = os.CreateTemp("", "riscv64asm")
193192
if err != nil {
194193
return
195194
}
@@ -299,7 +298,7 @@ func hexCases(t *testing.T, encoded string) func(func([]byte)) {
299298
func testdataCases(t *testing.T, syntax string) func(func([]byte)) {
300299
var codes [][]byte
301300
input := filepath.Join("testdata", syntax+"cases.txt")
302-
data, err := ioutil.ReadFile(input)
301+
data, err := os.ReadFile(input)
303302
if err != nil {
304303
t.Fatal(err)
305304
}

‎s390x/s390xasm/decode_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ package s390xasm
66

77
import (
88
"encoding/hex"
9-
"io/ioutil"
9+
"os"
1010
"path"
1111
"strings"
1212
"testing"
1313
)
1414

1515
func TestDecode(t *testing.T) {
16-
files, err := ioutil.ReadDir("testdata")
16+
files, err := os.ReadDir("testdata")
1717
if err != nil {
1818
t.Fatal(err)
1919
}
@@ -22,7 +22,7 @@ func TestDecode(t *testing.T) {
2222
continue
2323
}
2424
filename := path.Join("testdata", f.Name())
25-
data, err := ioutil.ReadFile(filename)
25+
data, err := os.ReadFile(filename)
2626
if err != nil {
2727
t.Fatal(err)
2828
}

‎x86/x86asm/decode_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ package x86asm
66

77
import (
88
"encoding/hex"
9-
"io/ioutil"
9+
"os"
1010
"strconv"
1111
"strings"
1212
"testing"
1313
)
1414

1515
func TestDecode(t *testing.T) {
16-
data, err := ioutil.ReadFile("testdata/decode.txt")
16+
data, err := os.ReadFile("testdata/decode.txt")
1717
if err != nil {
1818
t.Fatal(err)
1919
}

‎x86/x86asm/ext_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"flag"
1414
"fmt"
1515
"io"
16-
"io/ioutil"
1716
"log"
1817
"math/rand"
1918
"os"
@@ -193,7 +192,7 @@ const start = 0x8000 // start address of text
193192
// starting at offset start. That file is intended to be the input to
194193
// the external disassembler.
195194
func writeInst(generate func(func([]byte))) (file string, f *os.File, size int, err error) {
196-
f, err = ioutil.TempFile("", "x86map")
195+
f, err = os.CreateTemp("", "x86map")
197196
if err != nil {
198197
return
199198
}
@@ -524,7 +523,7 @@ func hexCases(t *testing.T, encoded string) func(func([]byte)) {
524523
// It only uses the inputs; it ignores the answers recorded in that file.
525524
func testdataCases(t *testing.T) func(func([]byte)) {
526525
var codes [][]byte
527-
data, err := ioutil.ReadFile("testdata/decode.txt")
526+
data, err := os.ReadFile("testdata/decode.txt")
528527
if err != nil {
529528
t.Fatal(err)
530529
}

‎x86/x86avxgen/avxgen_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package main
66

77
import (
88
"bytes"
9-
"io/ioutil"
9+
"os"
1010
"path/filepath"
1111
"regexp"
1212
"strings"
@@ -57,7 +57,7 @@ func TestOutput(t *testing.T) {
5757
var testCases []testCase
5858
{
5959
opcodeRE := regexp.MustCompile(`as: ([A-Z][A-Z0-9]*)`)
60-
data, err := ioutil.ReadFile(filepath.Join("testdata", "golden.txt"))
60+
data, err := os.ReadFile(filepath.Join("testdata", "golden.txt"))
6161
if err != nil {
6262
t.Fatalf("read golden file: %v", err)
6363
}

‎x86/xeddata/database.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"errors"
1010
"fmt"
1111
"io"
12-
"io/ioutil"
1312
"os"
1413
"path/filepath"
1514
"regexp"
@@ -212,7 +211,7 @@ func (db *Database) WidthSize(width string, m OperandSizeMode) string {
212211
}
213212

214213
func parseWidths(r io.Reader) (map[string]*width, error) {
215-
data, err := ioutil.ReadAll(r)
214+
data, err := io.ReadAll(r)
216215
if err != nil {
217216
return nil, fmt.Errorf("parse widths: %v", err)
218217
}
@@ -282,7 +281,7 @@ func parseExtraWidths(r io.Reader) (map[string]string, error) {
282281
}
283282

284283
func parseStates(r io.Reader) (map[string]string, error) {
285-
data, err := ioutil.ReadAll(r)
284+
data, err := io.ReadAll(r)
286285
if err != nil {
287286
return nil, fmt.Errorf("parse states: %v", err)
288287
}
@@ -303,7 +302,7 @@ func parseStates(r io.Reader) (map[string]string, error) {
303302
}
304303

305304
func parseXtypes(r io.Reader) (map[string]*xtype, error) {
306-
data, err := ioutil.ReadAll(r)
305+
data, err := io.ReadAll(r)
307306
if err != nil {
308307
return nil, fmt.Errorf("parse xtypes: %v", err)
309308
}

0 commit comments

Comments
 (0)