Skip to content

Commit 6d5bc51

Browse files
authored
Move away from deprecated ioutils (#825)
Fix #806
1 parent b508fa8 commit 6d5bc51

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package config
33
import (
44
"errors"
55
"fmt"
6-
"io/ioutil"
6+
"os"
77

88
"github.com/mgechev/revive/formatter"
99

@@ -140,7 +140,7 @@ func GetLintingRules(config *lint.Config, extraRules []lint.Rule) ([]lint.Rule,
140140
}
141141

142142
func parseConfig(path string, config *lint.Config) error {
143-
file, err := ioutil.ReadFile(path)
143+
file, err := os.ReadFile(path)
144144
if err != nil {
145145
return errors.New("cannot read the config file")
146146
}

logging/logger.go

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

33
import (
44
"io"
5-
"io/ioutil"
65
"log"
76
"os"
87
)
@@ -27,7 +26,7 @@ func GetLogger() (*log.Logger, error) {
2726
}
2827
} else {
2928
// Suppress all logging output if debug mode is disabled
30-
writer = ioutil.Discard
29+
writer = io.Discard
3130
}
3231

3332
logger = log.New(writer, "", log.LstdFlags)

revivelib/core.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package revivelib
22

33
import (
4-
"io/ioutil"
54
"log"
5+
"os"
66
"strings"
77

88
"github.com/mgechev/dots"
@@ -88,7 +88,7 @@ func (r *Revive) Lint(patterns ...*LintPattern) (<-chan lint.Failure, error) {
8888
}
8989

9090
revive := lint.New(func(file string) ([]byte, error) {
91-
contents, err := ioutil.ReadFile(file)
91+
contents, err := os.ReadFile(file)
9292

9393
if err != nil {
9494
return nil, errors.Wrap(err, "reading file "+file)

test/golint_test.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package test
22

33
import (
44
"flag"
5-
"io/ioutil"
5+
"os"
66
"path"
77
"regexp"
88
"testing"
@@ -41,9 +41,9 @@ func TestAll(t *testing.T) {
4141
t.Fatalf("Bad -lint.match value %q: %v", *lintMatch, err)
4242
}
4343

44-
fis, err := ioutil.ReadDir(baseDir)
44+
fis, err := os.ReadDir(baseDir)
4545
if err != nil {
46-
t.Fatalf("ioutil.ReadDir: %v", err)
46+
t.Fatalf("os.ReadDir: %v", err)
4747
}
4848
if len(fis) == 0 {
4949
t.Fatalf("no files in %v", baseDir)
@@ -53,12 +53,18 @@ func TestAll(t *testing.T) {
5353
continue
5454
}
5555
t.Run(fi.Name(), func(t *testing.T) {
56-
src, err := ioutil.ReadFile(path.Join(baseDir, fi.Name()))
56+
filePath := path.Join(baseDir, fi.Name())
57+
src, err := os.ReadFile(filePath)
5758
if err != nil {
5859
t.Fatalf("Failed reading %s: %v", fi.Name(), err)
5960
}
6061

61-
if err := assertFailures(t, baseDir, fi, src, rules, map[string]lint.RuleConfig{}); err != nil {
62+
fileInfo, err := os.Stat(filePath)
63+
if err != nil {
64+
t.Fatalf("Failed reading %s: %v", fi.Name(), err)
65+
}
66+
67+
if err := assertFailures(t, baseDir, fileInfo, src, rules, map[string]lint.RuleConfig{}); err != nil {
6268
t.Errorf("Linting %s: %v", fi.Name(), err)
6369
}
6470
})

test/utils.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"go/parser"
99
"go/token"
1010
"go/types"
11-
"io/ioutil"
1211
"os"
1312
"strconv"
1413
"strings"
@@ -21,7 +20,7 @@ import (
2120
func testRule(t *testing.T, filename string, rule lint.Rule, config ...*lint.RuleConfig) {
2221
baseDir := "../testdata/"
2322
filename = filename + ".go"
24-
src, err := ioutil.ReadFile(baseDir + filename)
23+
src, err := os.ReadFile(baseDir + filename)
2524
if err != nil {
2625
t.Fatalf("Bad filename path in test for %s: %v", rule.Name(), err)
2726
}
@@ -42,7 +41,7 @@ func testRule(t *testing.T, filename string, rule lint.Rule, config ...*lint.Rul
4241

4342
func assertSuccess(t *testing.T, baseDir string, fi os.FileInfo, rules []lint.Rule, config map[string]lint.RuleConfig) error {
4443
l := lint.New(func(file string) ([]byte, error) {
45-
return ioutil.ReadFile(baseDir + file)
44+
return os.ReadFile(baseDir + file)
4645
}, 0)
4746

4847
ps, err := l.Lint([][]string{{fi.Name()}}, rules, lint.Config{
@@ -64,7 +63,7 @@ func assertSuccess(t *testing.T, baseDir string, fi os.FileInfo, rules []lint.Ru
6463

6564
func assertFailures(t *testing.T, baseDir string, fi os.FileInfo, src []byte, rules []lint.Rule, config map[string]lint.RuleConfig) error {
6665
l := lint.New(func(file string) ([]byte, error) {
67-
return ioutil.ReadFile(baseDir + file)
66+
return os.ReadFile(baseDir + file)
6867
}, 0)
6968

7069
ins := parseInstructions(t, fi.Name(), src)

testdata/unused-param.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package fixtures
33
import (
44
"fmt"
55
"go/ast"
6-
"io/ioutil"
76
"os"
87
"runtime"
98
"testing"
@@ -103,7 +102,7 @@ func getCompareFailCause(n *node, which int, prevValue string, prevIndex uint64)
103102

104103
func assertSuccess(t *testing.T, baseDir string, fi os.FileInfo, src []byte, rules []lint.Rule, config map[string]lint.RuleConfig) error { // MATCH /parameter 'src' seems to be unused, consider removing or renaming it as _/
105104
l := lint.New(func(file string) ([]byte, error) {
106-
return ioutil.ReadFile(baseDir + file)
105+
return os.ReadFile(baseDir + file)
107106
})
108107

109108
ps, err := l.Lint([][]string{[]string{fi.Name()}}, rules, lint.Config{

0 commit comments

Comments
 (0)