Skip to content

Commit 22f439b

Browse files
committed
Avoid the deprecated ioutil package.
1 parent 473a00b commit 22f439b

File tree

5 files changed

+17
-22
lines changed

5 files changed

+17
-22
lines changed

roaring64/bsi64_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"encoding/binary"
66
"fmt"
77
"io"
8-
"io/ioutil"
98
"math/big"
109
"math/rand"
1110
"os"
@@ -645,7 +644,7 @@ func TestMinMaxWithNilFoundSet(t *testing.T) {
645644
}
646645

647646
func TestBSIWriteToReadFrom(t *testing.T) {
648-
file, err := ioutil.TempFile("./testdata", "bsi-test")
647+
file, err := os.CreateTemp("./testdata", "bsi-test")
649648
if err != nil {
650649
t.Fatal(err)
651650
}

roaring64/serialization_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"bytes"
77
"fmt"
88
"io"
9-
"io/ioutil"
109
"math"
1110
"os"
1211
"path/filepath"
@@ -276,7 +275,7 @@ func Test_tryReadFromRoaring32WithRoaring64(t *testing.T) {
276275
}
277276

278277
func Test_tryReadFromRoaring32WithRoaring64_File(t *testing.T) {
279-
tempDir, err := ioutil.TempDir("./", "testdata")
278+
tempDir, err := os.MkdirTemp("./", "testdata")
280279
if err != nil {
281280
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
282281
return
@@ -290,7 +289,7 @@ func Test_tryReadFromRoaring32WithRoaring64_File(t *testing.T) {
290289
}
291290

292291
name := filepath.Join(tempDir, "r32")
293-
if err := ioutil.WriteFile(name, bs, 0o600); err != nil {
292+
if err := os.WriteFile(name, bs, 0o600); err != nil {
294293
t.Fatal(err)
295294
}
296295
file, err := os.Open(name)

serialization_frozen_test.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package roaring
66
import (
77
"bytes"
88
"fmt"
9-
"io/ioutil"
109
"os"
1110
"reflect"
1211
"testing"
@@ -49,12 +48,12 @@ func TestFrozenFormat(t *testing.T) {
4948
t.Run("view "+name, func(t *testing.T) {
5049
t.Parallel()
5150

52-
frozenBuf, err := ioutil.ReadFile(fpath)
51+
frozenBuf, err := os.ReadFile(fpath)
5352
if err != nil {
5453
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
5554
return
5655
}
57-
portableBuf, err := ioutil.ReadFile(ppath)
56+
portableBuf, err := os.ReadFile(ppath)
5857
if err != nil {
5958
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
6059
return
@@ -75,12 +74,12 @@ func TestFrozenFormat(t *testing.T) {
7574
t.Run("freeze "+name, func(t *testing.T) {
7675
t.Parallel()
7776

78-
frozenBuf, err := ioutil.ReadFile(fpath)
77+
frozenBuf, err := os.ReadFile(fpath)
7978
if err != nil {
8079
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
8180
return
8281
}
83-
portableBuf, err := ioutil.ReadFile(ppath)
82+
portableBuf, err := os.ReadFile(ppath)
8483
if err != nil {
8584
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
8685
return
@@ -106,12 +105,12 @@ func TestFrozenFormat(t *testing.T) {
106105
t.Run("freeze with writer"+name, func(t *testing.T) {
107106
t.Parallel()
108107

109-
frozenBuf, err := ioutil.ReadFile(fpath)
108+
frozenBuf, err := os.ReadFile(fpath)
110109
if err != nil {
111110
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
112111
return
113112
}
114-
portableBuf, err := ioutil.ReadFile(ppath)
113+
portableBuf, err := os.ReadFile(ppath)
115114
if err != nil {
116115
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
117116
return

serialization_test.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"encoding/binary"
88
"encoding/gob"
99
"fmt"
10-
"io/ioutil"
1110
"os"
1211
"path/filepath"
1312
"runtime"
@@ -102,7 +101,7 @@ func TestSerializationToFile038(t *testing.T) {
102101
func TestSerializationReadRunsFromFile039(t *testing.T) {
103102
fn := "testdata/bitmapwithruns.bin"
104103

105-
by, err := ioutil.ReadFile(fn)
104+
by, err := os.ReadFile(fn)
106105
if err != nil {
107106
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
108107
return
@@ -464,7 +463,7 @@ func TestBitmap_FromBuffer(t *testing.T) {
464463
t.Run("bitmap with runs", func(t *testing.T) {
465464
file := "testdata/bitmapwithruns.bin"
466465

467-
buf, err := ioutil.ReadFile(file)
466+
buf, err := os.ReadFile(file)
468467
if err != nil {
469468
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
470469
return
@@ -480,7 +479,7 @@ func TestBitmap_FromBuffer(t *testing.T) {
480479

481480
t.Run("bitmap without runs", func(t *testing.T) {
482481
fn := "testdata/bitmapwithruns.bin"
483-
buf, err := ioutil.ReadFile(fn)
482+
buf, err := os.ReadFile(fn)
484483

485484
if err != nil {
486485
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
@@ -496,7 +495,7 @@ func TestBitmap_FromBuffer(t *testing.T) {
496495
// all3.classic somehow created by other tests.
497496
t.Run("all3.classic bitmap", func(t *testing.T) {
498497
file := "testdata/all3.classic"
499-
buf, err := ioutil.ReadFile(file)
498+
buf, err := os.ReadFile(file)
500499

501500
if err != nil {
502501
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
@@ -511,7 +510,7 @@ func TestBitmap_FromBuffer(t *testing.T) {
511510

512511
t.Run("testdata/bitmapwithruns.bin bitmap Ops", func(t *testing.T) {
513512
file := "testdata/bitmapwithruns.bin"
514-
buf, err := ioutil.ReadFile(file)
513+
buf, err := os.ReadFile(file)
515514

516515
if err != nil {
517516
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
@@ -545,7 +544,7 @@ func TestBitmap_FromBuffer(t *testing.T) {
545544

546545
t.Run("marking all containers as requiring COW", func(t *testing.T) {
547546
file := "testdata/bitmapwithruns.bin"
548-
buf, err := ioutil.ReadFile(file)
547+
buf, err := os.ReadFile(file)
549548

550549
if err != nil {
551550
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
@@ -572,7 +571,7 @@ func TestSerializationCrashers(t *testing.T) {
572571
}
573572

574573
for _, crasher := range crashers {
575-
data, err := ioutil.ReadFile(crasher)
574+
data, err := os.ReadFile(crasher)
576575
if err != nil {
577576
fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
578577
return

smat_generate_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package roaring
55

66
import (
77
"fmt"
8-
"io/ioutil"
98
"os"
109
"testing"
1110

@@ -21,7 +20,7 @@ func TestGenerateSmatCorpus(t *testing.T) {
2120
err, i, actionSeq)
2221
}
2322
os.MkdirAll("workdir/corpus", 0700)
24-
ioutil.WriteFile(fmt.Sprintf("workdir/corpus/%d", i), byteSequence, 0600)
23+
os.WriteFile(fmt.Sprintf("workdir/corpus/%d", i), byteSequence, 0600)
2524
}
2625
}
2726

0 commit comments

Comments
 (0)