Skip to content

Commit 97e44c5

Browse files
Петр ХабухаевПетр Хабухаев
Петр Хабухаев
authored and
Петр Хабухаев
committed
CTHL-2909: fix linter
1 parent 9697adf commit 97e44c5

File tree

12 files changed

+1188
-36
lines changed

12 files changed

+1188
-36
lines changed

‎cmd/go-mutesting/main.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import (
1010
"go/printer"
1111
"go/token"
1212
"go/types"
13-
"gopkg.in/yaml.v3"
1413
"io"
15-
"io/ioutil"
1614
"log"
1715
"os"
1816
"os/exec"
@@ -21,6 +19,8 @@ import (
2119
"strings"
2220
"syscall"
2321

22+
"gopkg.in/yaml.v3"
23+
2424
"github.com/avito-tech/go-mutesting/internal/importing"
2525
"github.com/avito-tech/go-mutesting/internal/models"
2626
"github.com/jessevdk/go-flags"
@@ -81,7 +81,7 @@ func checkArguments(args []string, opts *models.Options) (bool, int) {
8181
}
8282

8383
if opts.General.Config != "" {
84-
yamlFile, err := ioutil.ReadFile(opts.General.Config)
84+
yamlFile, err := os.ReadFile(opts.General.Config)
8585
if err != nil {
8686
return true, exitError("Could not read config file: %q", opts.General.Config)
8787
}
@@ -155,7 +155,7 @@ func mainCmd(args []string) int {
155155

156156
if len(opts.Files.Blacklist) > 0 {
157157
for _, f := range opts.Files.Blacklist {
158-
c, err := ioutil.ReadFile(f)
158+
c, err := os.ReadFile(f)
159159
if err != nil {
160160
return exitError("Cannot read blacklist file %q: %v", f, err)
161161
}
@@ -197,7 +197,7 @@ MUTATOR:
197197
})
198198
}
199199

200-
tmpDir, err := ioutil.TempDir("", "go-mutesting-")
200+
tmpDir, err := os.CreateTemp("", "go-mutesting-")
201201
if err != nil {
202202
panic(err)
203203
}
@@ -218,12 +218,12 @@ MUTATOR:
218218
return exitError(err.Error())
219219
}
220220

221-
err = os.MkdirAll(tmpDir+"/"+filepath.Dir(file), 0755)
221+
err = os.MkdirAll(tmpDir.Name()+"/"+filepath.Dir(file), 0755)
222222
if err != nil {
223223
panic(err)
224224
}
225225

226-
tmpFile := tmpDir + "/" + file
226+
tmpFile := tmpDir.Name() + "/" + file
227227

228228
originalFile := fmt.Sprintf("%s.original", tmpFile)
229229
err = osutil.CopyFile(file, originalFile)
@@ -251,11 +251,11 @@ MUTATOR:
251251
}
252252

253253
if !opts.General.DoNotRemoveTmpFolder {
254-
err = os.RemoveAll(tmpDir)
254+
err = os.RemoveAll(tmpDir.Name())
255255
if err != nil {
256256
panic(err)
257257
}
258-
debug(opts, "Remove %q", tmpDir)
258+
debug(opts, "Remove %q", tmpDir.Name())
259259
}
260260

261261
report.Calculate()
@@ -333,7 +333,7 @@ func mutate(
333333
break
334334
}
335335

336-
originalSourceCode, err := ioutil.ReadFile(originalFile)
336+
originalSourceCode, err := os.ReadFile(originalFile)
337337
if err != nil {
338338
log.Fatal(err)
339339
}
@@ -359,7 +359,7 @@ func mutate(
359359

360360
debug(opts, "Exited with %d", execExitCode)
361361

362-
mutatedSourceCode, err := ioutil.ReadFile(mutationFile)
362+
mutatedSourceCode, err := os.ReadFile(mutationFile)
363363
if err != nil {
364364
log.Fatal(err)
365365
}
@@ -579,7 +579,7 @@ func saveAST(mutationBlackList map[string]struct{}, file string, fset *token.Fil
579579
return "", false, err
580580
}
581581

582-
err = ioutil.WriteFile(file, src, 0666)
582+
err = os.WriteFile(file, src, 0666)
583583
if err != nil {
584584
return "", false, err
585585
}

‎cmd/go-mutesting/main_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"bytes"
55
"encoding/json"
66
"fmt"
7-
"github.com/avito-tech/go-mutesting/internal/models"
87
"io"
9-
"io/ioutil"
108
"os"
119
"testing"
1210

11+
"github.com/avito-tech/go-mutesting/internal/models"
12+
1313
"github.com/stretchr/testify/assert"
1414
)
1515

@@ -64,11 +64,11 @@ func TestMainSkipWithoutTest(t *testing.T) {
6464
}
6565

6666
func TestMainJSONReport(t *testing.T) {
67-
tmpDir, err := ioutil.TempDir("", "go-mutesting-main-test-")
67+
tmpDir, err := os.CreateTemp("", "go-mutesting-main-test-")
6868
assert.NoError(t, err)
6969

7070
reportFileName := "reportTestMainJSONReport.json"
71-
jsonFile := tmpDir + "/" + reportFileName
71+
jsonFile := tmpDir.Name() + "/" + reportFileName
7272
if _, err := os.Stat(jsonFile); err == nil {
7373
err = os.Remove(jsonFile)
7474
assert.NoError(t, err)
@@ -95,7 +95,7 @@ func TestMainJSONReport(t *testing.T) {
9595
}
9696
}()
9797

98-
jsonData, err := ioutil.ReadFile(jsonFile)
98+
jsonData, err := os.ReadFile(jsonFile)
9999
assert.NoError(t, err)
100100

101101
var mutationReport models.Report

‎example/a.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
type A struct{}
88

9-
func fooA() (a A, b http.Header) {
9+
func fooA() (a A, b http.Header) { //nolint:unused
1010
_, _, _ = a, b, http.Header{}
1111

1212
return a, b

‎example/b.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net/http"
55
)
66

7-
func fooB() (a A, b http.Header) {
7+
func fooB() (a A, b http.Header) { //nolint:unused
88
a, b = A{}, http.Header{}
99

1010
return a, b

‎example/example.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func bar() int {
4747
return 4
4848
}
4949

50-
func baz() int {
50+
func baz() int { //nolint:unused
5151
i := 1
5252
i = i + i
5353

‎go.mod

+177
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,184 @@ require (
1111
)
1212

1313
require (
14+
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
15+
4d63.com/gochecknoglobals v0.2.1 // indirect
16+
github.com/Abirdcfly/dupword v0.0.9 // indirect
17+
github.com/Antonboom/errname v0.1.7 // indirect
18+
github.com/Antonboom/nilnil v0.1.1 // indirect
19+
github.com/BurntSushi/toml v1.2.1 // indirect
20+
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
21+
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
22+
github.com/Masterminds/semver v1.5.0 // indirect
23+
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
24+
github.com/alexkohler/prealloc v1.0.0 // indirect
25+
github.com/alingse/asasalint v0.0.11 // indirect
26+
github.com/ashanbrown/forbidigo v1.4.0 // indirect
27+
github.com/ashanbrown/makezero v1.1.1 // indirect
28+
github.com/beorn7/perks v1.0.1 // indirect
29+
github.com/bkielbasa/cyclop v1.2.0 // indirect
30+
github.com/blizzy78/varnamelen v0.8.0 // indirect
31+
github.com/bombsimon/wsl/v3 v3.4.0 // indirect
32+
github.com/breml/bidichk v0.2.3 // indirect
33+
github.com/breml/errchkjson v0.3.0 // indirect
34+
github.com/butuzov/ireturn v0.1.1 // indirect
35+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
36+
github.com/charithe/durationcheck v0.0.9 // indirect
37+
github.com/chavacava/garif v0.0.0-20221024190013-b3ef35877348 // indirect
38+
github.com/curioswitch/go-reassign v0.2.0 // indirect
39+
github.com/daixiang0/gci v0.9.1 // indirect
1440
github.com/davecgh/go-spew v1.1.1 // indirect
41+
github.com/denis-tingaikin/go-header v0.4.3 // indirect
42+
github.com/esimonov/ifshort v1.0.4 // indirect
43+
github.com/ettle/strcase v0.1.1 // indirect
44+
github.com/fatih/color v1.14.1 // indirect
45+
github.com/fatih/structtag v1.2.0 // indirect
46+
github.com/firefart/nonamedreturns v1.0.4 // indirect
47+
github.com/fsnotify/fsnotify v1.6.0 // indirect
48+
github.com/fzipp/gocyclo v0.6.0 // indirect
49+
github.com/go-critic/go-critic v0.6.7 // indirect
50+
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
51+
github.com/go-toolsmith/astcast v1.1.0 // indirect
52+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
53+
github.com/go-toolsmith/astequal v1.1.0 // indirect
54+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
55+
github.com/go-toolsmith/astp v1.1.0 // indirect
56+
github.com/go-toolsmith/strparse v1.1.0 // indirect
57+
github.com/go-toolsmith/typep v1.1.0 // indirect
58+
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
59+
github.com/gobwas/glob v0.2.3 // indirect
60+
github.com/gofrs/flock v0.8.1 // indirect
61+
github.com/golang/protobuf v1.5.2 // indirect
62+
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
63+
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
64+
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
65+
github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect
66+
github.com/golangci/golangci-lint v1.51.2 // indirect
67+
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
68+
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
69+
github.com/golangci/misspell v0.4.0 // indirect
70+
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
71+
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
72+
github.com/google/go-cmp v0.5.9 // indirect
73+
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect
74+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
75+
github.com/gostaticanalysis/comment v1.4.2 // indirect
76+
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
77+
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
78+
github.com/hashicorp/errwrap v1.1.0 // indirect
79+
github.com/hashicorp/go-multierror v1.1.1 // indirect
80+
github.com/hashicorp/go-version v1.6.0 // indirect
81+
github.com/hashicorp/hcl v1.0.0 // indirect
82+
github.com/hexops/gotextdiff v1.0.3 // indirect
83+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
84+
github.com/jgautheron/goconst v1.5.1 // indirect
85+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
86+
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
87+
github.com/json-iterator/go v1.1.12 // indirect
88+
github.com/julz/importas v0.1.0 // indirect
89+
github.com/junk1tm/musttag v0.4.5 // indirect
90+
github.com/kisielk/errcheck v1.6.3 // indirect
91+
github.com/kisielk/gotool v1.0.0 // indirect
92+
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
93+
github.com/kulti/thelper v0.6.3 // indirect
94+
github.com/kunwardeep/paralleltest v1.0.6 // indirect
95+
github.com/kyoh86/exportloopref v0.1.11 // indirect
96+
github.com/ldez/gomoddirectives v0.2.3 // indirect
97+
github.com/ldez/tagliatelle v0.4.0 // indirect
98+
github.com/leonklingele/grouper v1.1.1 // indirect
99+
github.com/lufeee/execinquery v1.2.1 // indirect
100+
github.com/magiconair/properties v1.8.7 // indirect
101+
github.com/maratori/testableexamples v1.0.0 // indirect
102+
github.com/maratori/testpackage v1.1.0 // indirect
103+
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
104+
github.com/mattn/go-colorable v0.1.13 // indirect
105+
github.com/mattn/go-isatty v0.0.17 // indirect
106+
github.com/mattn/go-runewidth v0.0.14 // indirect
107+
github.com/mattn/goveralls v0.0.11 // indirect
108+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
109+
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
110+
github.com/mgechev/revive v1.2.5 // indirect
111+
github.com/mitchellh/go-homedir v1.1.0 // indirect
112+
github.com/mitchellh/mapstructure v1.5.0 // indirect
113+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
114+
github.com/modern-go/reflect2 v1.0.2 // indirect
115+
github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5 // indirect
116+
github.com/moricho/tparallel v0.2.1 // indirect
117+
github.com/nakabonne/nestif v0.3.1 // indirect
118+
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
119+
github.com/nishanths/exhaustive v0.9.5 // indirect
120+
github.com/nishanths/predeclared v0.2.2 // indirect
121+
github.com/nunnatsa/ginkgolinter v0.8.1 // indirect
122+
github.com/nxadm/tail v1.4.8 // indirect
123+
github.com/olekukonko/tablewriter v0.0.5 // indirect
124+
github.com/onsi/ginkgo v1.16.5 // indirect
125+
github.com/pelletier/go-toml v1.9.5 // indirect
126+
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
127+
github.com/pkg/errors v0.9.1 // indirect
15128
github.com/pmezard/go-difflib v1.0.0 // indirect
129+
github.com/polyfloyd/go-errorlint v1.1.0 // indirect
130+
github.com/prometheus/client_golang v1.14.0 // indirect
131+
github.com/prometheus/client_model v0.3.0 // indirect
132+
github.com/prometheus/common v0.40.0 // indirect
133+
github.com/prometheus/procfs v0.9.0 // indirect
134+
github.com/quasilyte/go-ruleguard v0.3.19 // indirect
135+
github.com/quasilyte/gogrep v0.5.0 // indirect
136+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
137+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
138+
github.com/rivo/uniseg v0.4.4 // indirect
139+
github.com/ryancurrah/gomodguard v1.3.0 // indirect
140+
github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect
141+
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
142+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
143+
github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect
144+
github.com/securego/gosec/v2 v2.15.0 // indirect
145+
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
146+
github.com/sirupsen/logrus v1.9.0 // indirect
147+
github.com/sivchari/containedctx v1.0.2 // indirect
148+
github.com/sivchari/nosnakecase v1.7.0 // indirect
149+
github.com/sivchari/tenv v1.7.1 // indirect
150+
github.com/sonatard/noctx v0.0.1 // indirect
151+
github.com/sourcegraph/go-diff v0.7.0 // indirect
152+
github.com/spf13/afero v1.9.3 // indirect
153+
github.com/spf13/cast v1.5.0 // indirect
154+
github.com/spf13/cobra v1.6.1 // indirect
155+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
156+
github.com/spf13/pflag v1.0.5 // indirect
157+
github.com/spf13/viper v1.15.0 // indirect
158+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
159+
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
160+
github.com/stretchr/objx v0.5.0 // indirect
161+
github.com/subosito/gotenv v1.4.2 // indirect
162+
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
163+
github.com/tdakkota/asciicheck v0.1.1 // indirect
164+
github.com/tetafro/godot v1.4.11 // indirect
165+
github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e // indirect
166+
github.com/timonwong/loggercheck v0.9.4 // indirect
167+
github.com/tomarrell/wrapcheck/v2 v2.8.0 // indirect
168+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
169+
github.com/ultraware/funlen v0.0.3 // indirect
170+
github.com/ultraware/whitespace v0.0.5 // indirect
171+
github.com/uudashr/gocognit v1.0.6 // indirect
172+
github.com/yagipy/maintidx v1.0.0 // indirect
173+
github.com/yeya24/promlinter v0.2.0 // indirect
174+
gitlab.com/bosi/decorder v0.2.3 // indirect
175+
go.uber.org/atomic v1.10.0 // indirect
176+
go.uber.org/multierr v1.9.0 // indirect
177+
go.uber.org/zap v1.24.0 // indirect
178+
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
179+
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect
180+
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
181+
golang.org/x/mod v0.8.0 // indirect
182+
golang.org/x/sync v0.1.0 // indirect
16183
golang.org/x/sys v0.5.0 // indirect
184+
golang.org/x/text v0.7.0 // indirect
185+
google.golang.org/protobuf v1.28.1 // indirect
186+
gopkg.in/ini.v1 v1.67.0 // indirect
187+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
188+
gopkg.in/yaml.v2 v2.4.0 // indirect
189+
honnef.co/go/tools v0.4.2 // indirect
190+
mvdan.cc/gofumpt v0.4.0 // indirect
191+
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
192+
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
193+
mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 // indirect
17194
)

0 commit comments

Comments
 (0)