Skip to content

Commit ce48f90

Browse files
cloudlenacloudlena
committed
Remove deprecated ioutil dependency
https://go.dev/doc/go1.16#ioutil
1 parent 81831ee commit ce48f90

File tree

8 files changed

+28
-32
lines changed

8 files changed

+28
-32
lines changed

‎cmd/fitgen/internal/profile/generator.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"errors"
55
"fmt"
66
"io"
7-
"io/ioutil"
87
"log"
98
"sort"
109
"strings"
@@ -78,7 +77,7 @@ func NewGenerator(sdkMajVer, sdkMinVer int, workbookData []byte, opts ...Generat
7877
// The code generation is not performance critical,
7978
// so we can avoid nil-checks when logging.
8079
if g.opts.logger == nil {
81-
g.opts.logger = log.New(ioutil.Discard, "", 0)
80+
g.opts.logger = log.New(io.Discard, "", 0)
8281
}
8382

8483
g.logf("sdk version: %d.%d", sdkMajVer, sdkMinVer)

‎cmd/fitgen/internal/profile/generator_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"fmt"
88
"go/format"
99
"io"
10-
"io/ioutil"
1110
"os"
1211
"path/filepath"
1312
"strings"
@@ -67,7 +66,7 @@ func writeProfileToFile(p *profile.Profile, path string) error {
6766
if err != nil {
6867
return err
6968
}
70-
return ioutil.WriteFile(path, buf.Bytes(), 0o644)
69+
return os.WriteFile(path, buf.Bytes(), 0o644)
7170
}
7271

7372
func scanLinesPreserveEOL(data []byte, atEOF bool) (advance int, token []byte, err error) {
@@ -213,7 +212,7 @@ func TestGenerator(t *testing.T) {
213212
t.Skip("skipping test in short mode")
214213
}
215214
path := relPath(sdkFullVer)
216-
data, err := ioutil.ReadFile(path)
215+
data, err := os.ReadFile(path)
217216
if err != nil {
218217
t.Fatal(err)
219218
}
@@ -265,7 +264,7 @@ func BenchmarkGenerator(b *testing.B) {
265264
sdkFullVer := fmt.Sprintf("%d.%d", sdk.majVer, sdk.minVer)
266265
b.Run(sdkFullVer, func(b *testing.B) {
267266
path := relPath(sdkFullVer)
268-
data, err := ioutil.ReadFile(path)
267+
data, err := os.ReadFile(path)
269268
if err != nil {
270269
b.Fatalf("error reading profile workbook: %v", err)
271270
}

‎cmd/fitgen/main.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"archive/zip"
55
"flag"
66
"fmt"
7-
"io/ioutil"
7+
"io"
88
"log"
99
"os"
1010
"os/exec"
@@ -126,15 +126,15 @@ func main() {
126126
l.Fatal(err)
127127
}
128128

129-
if err = ioutil.WriteFile(typesOut, fitProfile.TypesSource, 0o644); err != nil {
129+
if err = os.WriteFile(typesOut, fitProfile.TypesSource, 0o644); err != nil {
130130
l.Fatalf("typegen: error writing types output file: %v", err)
131131
}
132132

133-
if err = ioutil.WriteFile(messagesOut, fitProfile.MessagesSource, 0o644); err != nil {
133+
if err = os.WriteFile(messagesOut, fitProfile.MessagesSource, 0o644); err != nil {
134134
l.Fatalf("typegen: error writing messages output file: %v", err)
135135
}
136136

137-
if err = ioutil.WriteFile(profileOut, fitProfile.ProfileSource, 0o644); err != nil {
137+
if err = os.WriteFile(profileOut, fitProfile.ProfileSource, 0o644); err != nil {
138138
l.Fatalf("typegen: error writing profile output file: %v", err)
139139
}
140140

@@ -164,7 +164,7 @@ func runStringerOnTypes(typesIn, typesStringOut string, fitTypes []string) error
164164
return fmt.Errorf("fitstringer: generation failed: %v", err)
165165
}
166166

167-
if err := ioutil.WriteFile(typesStringOut, output, 0o644); err != nil {
167+
if err := os.WriteFile(typesStringOut, output, 0o644); err != nil {
168168
return fmt.Errorf("error writing fitstringer output: %v", err)
169169
}
170170

@@ -215,7 +215,7 @@ func readDataFromZIP(path string) ([]byte, error) {
215215
}
216216
defer rc.Close()
217217

218-
data, err := ioutil.ReadAll(rc)
218+
data, err := io.ReadAll(rc)
219219
if err != nil {
220220
return nil, fmt.Errorf("error reading %q from archive: %v", wfile.Name, err)
221221
}
@@ -233,7 +233,7 @@ func scanForWorkbook(files []*zip.File) *zip.File {
233233
}
234234

235235
func readDataFromXLSX(path string) ([]byte, error) {
236-
return ioutil.ReadFile(path)
236+
return os.ReadFile(path)
237237
}
238238

239239
func parseSDKVersionStringFromZipFilePath(path string) string {

‎example_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package fit_test
33
import (
44
"bytes"
55
"fmt"
6-
"io/ioutil"
6+
"os"
77
"path/filepath"
88

99
"github.com/tormoder/fit"
@@ -12,7 +12,7 @@ import (
1212
func Example() {
1313
// Read our FIT test file data
1414
testFile := filepath.Join("testdata", "fitsdk", "Activity.fit")
15-
testData, err := ioutil.ReadFile(testFile)
15+
testData, err := os.ReadFile(testFile)
1616
if err != nil {
1717
fmt.Println(err)
1818
return

‎reader_test.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"flag"
66
"fmt"
7-
"io/ioutil"
87
"os"
98
"path/filepath"
109
"runtime"
@@ -32,7 +31,7 @@ func activitySmall() []byte {
3231
activitySmallMu.Lock()
3332
defer activitySmallMu.Unlock()
3433
activitySmallOnce.Do(func() {
35-
asd, err := ioutil.ReadFile(activitySmallPath)
34+
asd, err := os.ReadFile(activitySmallPath)
3635
if err != nil {
3736
errDesc := fmt.Sprintf("parseActivitySmallData failed: %v", err)
3837
panic(errDesc)
@@ -95,7 +94,7 @@ func TestDecode(t *testing.T) {
9594
t.Run(fmt.Sprintf("%s/%s", file.folder, file.name), func(t *testing.T) {
9695
t.Parallel()
9796
fpath := filepath.Join(tdfolder, file.folder, file.name)
98-
data, err := ioutil.ReadFile(fpath)
97+
data, err := os.ReadFile(fpath)
9998
if err != nil {
10099
t.Fatalf("reading file failed: %v", err)
101100
}
@@ -196,7 +195,7 @@ func TestDecodeChained(t *testing.T) {
196195
ctf := ctf
197196
t.Run(ctf.fpath, func(t *testing.T) {
198197
t.Parallel()
199-
data, err := ioutil.ReadFile(ctf.fpath)
198+
data, err := os.ReadFile(ctf.fpath)
200199
if err != nil {
201200
t.Fatalf("reading file data failed: %v", err)
202201
}
@@ -223,7 +222,7 @@ func TestCheckIntegrity(t *testing.T) {
223222
})
224223
t.Run("ActivitySDK", func(t *testing.T) {
225224
fpath := filepath.Join(tdfolder, "fitsdk", "Activity.fit")
226-
data, err := ioutil.ReadFile(fpath)
225+
data, err := os.ReadFile(fpath)
227226
if err != nil {
228227
t.Fatalf("reading %q failed: %v", fpath, err)
229228
}
@@ -296,7 +295,7 @@ func BenchmarkDecode(b *testing.B) {
296295
}
297296
for _, file := range files {
298297
b.Run(file.desc, func(b *testing.B) {
299-
data, err := ioutil.ReadFile(file.path)
298+
data, err := os.ReadFile(file.path)
300299
if err != nil {
301300
b.Fatalf("%q: error reading file: %v", file.path, err)
302301
}
@@ -314,7 +313,7 @@ func BenchmarkDecode(b *testing.B) {
314313
}
315314

316315
func BenchmarkDecodeActivityLargeParallel(b *testing.B) {
317-
data, err := ioutil.ReadFile(activityLargePath)
316+
data, err := os.ReadFile(activityLargePath)
318317
if err != nil {
319318
b.Fatal(err)
320319
}

‎reader_util_test.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"fmt"
77
"go/format"
88
"io"
9-
"io/ioutil"
109
"log"
1110
"os"
1211
"strconv"
@@ -85,13 +84,13 @@ var tdoString = [...]string{
8584
}
8685

8786
func discardLogger() *log.Logger {
88-
return log.New(ioutil.Discard, "", 0)
87+
return log.New(io.Discard, "", 0)
8988
}
9089

9190
func regenerateDecodeTestTable() error {
9291
const header = `// Generated by reader_util_test.go.
93-
// Only edit to bootstrap new entries or change existing entries.
94-
92+
// Only edit to bootstrap new entries or change existing entries.
93+
9594
package fit_test
9695
9796
var decodeTestFiles = [...]struct {
@@ -131,7 +130,7 @@ var decodeTestFiles = [...]struct {
131130
return fmt.Errorf("format.Source: %v on\n%s", err, preFormat)
132131
}
133132

134-
return ioutil.WriteFile("reader_files_test.go", src, 0o644)
133+
return os.WriteFile("reader_files_test.go", src, 0o644)
135134
}
136135

137136
type gen struct {

‎timeutil/example_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package timeutil_test
33
import (
44
"bytes"
55
"fmt"
6-
"io/ioutil"
6+
"os"
77
"path/filepath"
88

99
"github.com/tormoder/fit"
@@ -12,7 +12,7 @@ import (
1212

1313
func ExampleSetLocalTimeZone() {
1414
testFile := filepath.Join("../testdata", "fitsdk", "Activity.fit")
15-
testData, err := ioutil.ReadFile(testFile)
15+
testData, err := os.ReadFile(testFile)
1616
if err != nil {
1717
fmt.Println(err)
1818
return

‎writer_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"encoding/binary"
66
"fmt"
7-
"io/ioutil"
7+
"os"
88
"path/filepath"
99
"runtime"
1010
"strings"
@@ -37,7 +37,7 @@ func TestDecodeEncodeDecode(t *testing.T) {
3737
t.Parallel()
3838
fpath := filepath.Join(tdfolder, file.folder, file.name)
3939

40-
inData, err := ioutil.ReadFile(fpath)
40+
inData, err := os.ReadFile(fpath)
4141
if err != nil {
4242
t.Fatalf("reading file failed: %v", err)
4343
}
@@ -140,7 +140,7 @@ func BenchmarkEncode(b *testing.B) {
140140
}
141141
for _, file := range files {
142142
b.Run(file.desc, func(b *testing.B) {
143-
data, err := ioutil.ReadFile(file.path)
143+
data, err := os.ReadFile(file.path)
144144
if err != nil {
145145
b.Fatalf("%q: error reading file: %v", file.path, err)
146146
}

0 commit comments

Comments
 (0)