Skip to content

Commit 8ac9348

Browse files
alexandearalexandear
committed
dev: gofmt -w -r 'interface{} -> any' pkg scripts
1 parent 0b57096 commit 8ac9348

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+186
-183
lines changed

‎pkg/config/linters_settings.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ type GoCriticSettings struct {
368368
SettingsPerCheck map[string]GoCriticCheckSettings `mapstructure:"settings"`
369369
}
370370

371-
type GoCriticCheckSettings map[string]interface{}
371+
type GoCriticCheckSettings map[string]any
372372

373373
type GoCycloSettings struct {
374374
MinComplexity int `mapstructure:"min-complexity"`
@@ -421,11 +421,11 @@ type GoLintSettings struct {
421421
}
422422

423423
type GoMndSettings struct {
424-
Settings map[string]map[string]interface{} // Deprecated
425-
Checks []string `mapstructure:"checks"`
426-
IgnoredNumbers []string `mapstructure:"ignored-numbers"`
427-
IgnoredFiles []string `mapstructure:"ignored-files"`
428-
IgnoredFunctions []string `mapstructure:"ignored-functions"`
424+
Settings map[string]map[string]any // Deprecated
425+
Checks []string `mapstructure:"checks"`
426+
IgnoredNumbers []string `mapstructure:"ignored-numbers"`
427+
IgnoredFiles []string `mapstructure:"ignored-files"`
428+
IgnoredFunctions []string `mapstructure:"ignored-functions"`
429429
}
430430

431431
type GoModDirectivesSettings struct {
@@ -454,13 +454,13 @@ type GoModGuardSettings struct {
454454
}
455455

456456
type GoSecSettings struct {
457-
Includes []string `mapstructure:"includes"`
458-
Excludes []string `mapstructure:"excludes"`
459-
Severity string `mapstructure:"severity"`
460-
Confidence string `mapstructure:"confidence"`
461-
ExcludeGenerated bool `mapstructure:"exclude-generated"`
462-
Config map[string]interface{} `mapstructure:"config"`
463-
Concurrency int `mapstructure:"concurrency"`
457+
Includes []string `mapstructure:"includes"`
458+
Excludes []string `mapstructure:"excludes"`
459+
Severity string `mapstructure:"severity"`
460+
Confidence string `mapstructure:"confidence"`
461+
ExcludeGenerated bool `mapstructure:"exclude-generated"`
462+
Config map[string]any `mapstructure:"config"`
463+
Concurrency int `mapstructure:"concurrency"`
464464
}
465465

466466
type GosmopolitanSettings struct {
@@ -473,7 +473,7 @@ type GosmopolitanSettings struct {
473473
type GovetSettings struct {
474474
Go string `mapstructure:"-"`
475475
CheckShadowing bool `mapstructure:"check-shadowing"`
476-
Settings map[string]map[string]interface{}
476+
Settings map[string]map[string]any
477477

478478
Enable []string
479479
Disable []string
@@ -628,7 +628,7 @@ type ReviveSettings struct {
628628
EnableAllRules bool `mapstructure:"enable-all-rules"`
629629
Rules []struct {
630630
Name string
631-
Arguments []interface{}
631+
Arguments []any
632632
Severity string
633633
Disabled bool
634634
}

‎pkg/fsutils/filecache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func PrettifyBytesCount(n int64) string {
5454
func (fc *FileCache) PrintStats(log logutils.Log) {
5555
var size int64
5656
var mapLen int
57-
fc.files.Range(func(_, fileBytes interface{}) bool {
57+
fc.files.Range(func(_, fileBytes any) bool {
5858
mapLen++
5959
size += int64(len(fileBytes.([]byte)))
6060

‎pkg/golinters/bidichk.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
func NewBiDiChkFuncName(cfg *config.BiDiChkSettings) *goanalysis.Linter {
1414
a := bidichk.NewAnalyzer()
1515

16-
cfgMap := map[string]map[string]interface{}{}
16+
cfgMap := map[string]map[string]any{}
1717
if cfg != nil {
1818
var opts []string
1919

@@ -45,7 +45,7 @@ func NewBiDiChkFuncName(cfg *config.BiDiChkSettings) *goanalysis.Linter {
4545
opts = append(opts, "POP-DIRECTIONAL-ISOLATE")
4646
}
4747

48-
cfgMap[a.Name] = map[string]interface{}{
48+
cfgMap[a.Name] = map[string]any{
4949
"disallowed-runes": strings.Join(opts, ","),
5050
}
5151
}

‎pkg/golinters/cyclop.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ const cyclopName = "cyclop"
1313
func NewCyclop(settings *config.Cyclop) *goanalysis.Linter {
1414
a := analyzer.NewAnalyzer()
1515

16-
var cfg map[string]map[string]interface{}
16+
var cfg map[string]map[string]any
1717
if settings != nil {
18-
d := map[string]interface{}{
18+
d := map[string]any{
1919
"skipTests": settings.SkipTests,
2020
}
2121

@@ -27,7 +27,7 @@ func NewCyclop(settings *config.Cyclop) *goanalysis.Linter {
2727
d["packageAverage"] = settings.PackageAverage
2828
}
2929

30-
cfg = map[string]map[string]interface{}{a.Name: d}
30+
cfg = map[string]map[string]any{a.Name: d}
3131
}
3232

3333
return goanalysis.NewLinter(

‎pkg/golinters/deadcode.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func NewDeadcode() *goanalysis.Linter {
2121
analyzer := &analysis.Analyzer{
2222
Name: deadcodeName,
2323
Doc: goanalysis.TheOnlyanalyzerDoc,
24-
Run: func(pass *analysis.Pass) (interface{}, error) {
24+
Run: func(pass *analysis.Pass) (any, error) {
2525
prog := goanalysis.MakeFakeLoaderProgram(pass)
2626

2727
issues, err := deadcodeAPI.Run(prog)

‎pkg/golinters/decorder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func NewDecorder(settings *config.DecorderSettings) *goanalysis.Linter {
1414
a := decorder.Analyzer
1515

1616
// disable all rules/checks by default
17-
cfg := map[string]interface{}{
17+
cfg := map[string]any{
1818
"disable-dec-num-check": true,
1919
"disable-dec-order-check": true,
2020
"disable-init-func-first-check": true,
@@ -31,6 +31,6 @@ func NewDecorder(settings *config.DecorderSettings) *goanalysis.Linter {
3131
a.Name,
3232
a.Doc,
3333
[]*analysis.Analyzer{a},
34-
map[string]map[string]interface{}{a.Name: cfg},
34+
map[string]map[string]any{a.Name: cfg},
3535
).WithLoadMode(goanalysis.LoadModeSyntax)
3636
}

‎pkg/golinters/depguard.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func NewDepguard(settings *config.DepGuardSettings) *goanalysis.Linter {
3636
).WithContextSetter(func(lintCtx *linter.Context) {
3737
dg, err := newDepGuard(settings)
3838

39-
analyzer.Run = func(pass *analysis.Pass) (interface{}, error) {
39+
analyzer.Run = func(pass *analysis.Pass) (any, error) {
4040
if err != nil {
4141
return nil, err
4242
}

‎pkg/golinters/dogsled.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func NewDogsled(settings *config.DogsledSettings) *goanalysis.Linter {
2424
analyzer := &analysis.Analyzer{
2525
Name: dogsledName,
2626
Doc: goanalysis.TheOnlyanalyzerDoc,
27-
Run: func(pass *analysis.Pass) (interface{}, error) {
27+
Run: func(pass *analysis.Pass) (any, error) {
2828
issues := runDogsled(pass, settings)
2929

3030
if len(issues) == 0 {

‎pkg/golinters/dupl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func NewDupl(settings *config.DuplSettings) *goanalysis.Linter {
2525
analyzer := &analysis.Analyzer{
2626
Name: duplName,
2727
Doc: goanalysis.TheOnlyanalyzerDoc,
28-
Run: func(pass *analysis.Pass) (interface{}, error) {
28+
Run: func(pass *analysis.Pass) (any, error) {
2929
issues, err := runDupl(pass, settings)
3030
if err != nil {
3131
return nil, err

‎pkg/golinters/dupword.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
func NewDupWord(setting *config.DupWordSettings) *goanalysis.Linter {
1414
a := dupword.NewAnalyzer()
1515

16-
cfgMap := map[string]map[string]interface{}{}
16+
cfgMap := map[string]map[string]any{}
1717
if setting != nil {
18-
cfgMap[a.Name] = map[string]interface{}{
18+
cfgMap[a.Name] = map[string]any{
1919
"keyword": strings.Join(setting.Keywords, ","),
2020
}
2121
}

‎pkg/golinters/errcheck.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func NewErrcheck(settings *config.ErrcheckSettings) *goanalysis.Linter {
4949

5050
checker.Tags = lintCtx.Cfg.Run.BuildTags
5151

52-
analyzer.Run = func(pass *analysis.Pass) (interface{}, error) {
52+
analyzer.Run = func(pass *analysis.Pass) (any, error) {
5353
issues := runErrCheck(lintCtx, pass, checker)
5454
if err != nil {
5555
return nil, err

‎pkg/golinters/errchkjson.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
func NewErrChkJSONFuncName(cfg *config.ErrChkJSONSettings) *goanalysis.Linter {
1212
a := errchkjson.NewAnalyzer()
1313

14-
cfgMap := map[string]map[string]interface{}{}
15-
cfgMap[a.Name] = map[string]interface{}{
14+
cfgMap := map[string]map[string]any{}
15+
cfgMap[a.Name] = map[string]any{
1616
"omit-safe": true,
1717
}
1818
if cfg != nil {
19-
cfgMap[a.Name] = map[string]interface{}{
19+
cfgMap[a.Name] = map[string]any{
2020
"omit-safe": !cfg.CheckErrorFreeEncoding,
2121
"report-no-exported": cfg.ReportNoExported,
2222
}

‎pkg/golinters/errorlint.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
func NewErrorLint(cfg *config.ErrorLintSettings) *goanalysis.Linter {
1212
a := errorlint.NewAnalyzer()
1313

14-
cfgMap := map[string]map[string]interface{}{}
14+
cfgMap := map[string]map[string]any{}
1515

1616
if cfg != nil {
17-
cfgMap[a.Name] = map[string]interface{}{
17+
cfgMap[a.Name] = map[string]any{
1818
"errorf": cfg.Errorf,
1919
"errorf-multi": cfg.ErrorfMulti,
2020
"asserts": cfg.Asserts,

‎pkg/golinters/exhaustive.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
func NewExhaustive(settings *config.ExhaustiveSettings) *goanalysis.Linter {
1212
a := exhaustive.Analyzer
1313

14-
var cfg map[string]map[string]interface{}
14+
var cfg map[string]map[string]any
1515
if settings != nil {
16-
cfg = map[string]map[string]interface{}{
16+
cfg = map[string]map[string]any{
1717
a.Name: {
1818
exhaustive.CheckFlag: settings.Check,
1919
exhaustive.CheckGeneratedFlag: settings.CheckGenerated,

‎pkg/golinters/exhaustivestruct.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
func NewExhaustiveStruct(settings *config.ExhaustiveStructSettings) *goanalysis.Linter {
1414
a := analyzer.Analyzer
1515

16-
var cfg map[string]map[string]interface{}
16+
var cfg map[string]map[string]any
1717
if settings != nil {
18-
cfg = map[string]map[string]interface{}{
18+
cfg = map[string]map[string]any{
1919
a.Name: {
2020
"struct_patterns": strings.Join(settings.StructPatterns, ","),
2121
},

‎pkg/golinters/forbidigo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func NewForbidigo(settings *config.ForbidigoSettings) *goanalysis.Linter {
2323
analyzer := &analysis.Analyzer{
2424
Name: forbidigoName,
2525
Doc: goanalysis.TheOnlyanalyzerDoc,
26-
Run: func(pass *analysis.Pass) (interface{}, error) {
26+
Run: func(pass *analysis.Pass) (any, error) {
2727
issues, err := runForbidigo(pass, settings)
2828
if err != nil {
2929
return nil, err

‎pkg/golinters/funlen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func NewFunlen(settings *config.FunlenSettings) *goanalysis.Linter {
2424
analyzer := &analysis.Analyzer{
2525
Name: funlenName,
2626
Doc: goanalysis.TheOnlyanalyzerDoc,
27-
Run: func(pass *analysis.Pass) (interface{}, error) {
27+
Run: func(pass *analysis.Pass) (any, error) {
2828
issues := runFunlen(pass, settings)
2929

3030
if len(issues) == 0 {

‎pkg/golinters/gci.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func NewGci(settings *config.GciSettings) *goanalysis.Linter {
6161
[]*analysis.Analyzer{analyzer},
6262
nil,
6363
).WithContextSetter(func(lintCtx *linter.Context) {
64-
analyzer.Run = func(pass *analysis.Pass) (interface{}, error) {
64+
analyzer.Run = func(pass *analysis.Pass) (any, error) {
6565
issues, err := runGci(pass, lintCtx, cfg, &lock)
6666
if err != nil {
6767
return nil, err

‎pkg/golinters/ginkgolinter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
func NewGinkgoLinter(cfg *config.GinkgoLinterSettings) *goanalysis.Linter {
1212
a := ginkgolinter.NewAnalyzer()
1313

14-
cfgMap := make(map[string]map[string]interface{})
14+
cfgMap := make(map[string]map[string]any)
1515
if cfg != nil {
16-
cfgMap[a.Name] = map[string]interface{}{
16+
cfgMap[a.Name] = map[string]any{
1717
"suppress-len-assertion": cfg.SuppressLenAssertion,
1818
"suppress-nil-assertion": cfg.SuppressNilAssertion,
1919
"suppress-err-assertion": cfg.SuppressErrAssertion,

‎pkg/golinters/goanalysis/linter.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ const (
4444
type Linter struct {
4545
name, desc string
4646
analyzers []*analysis.Analyzer
47-
cfg map[string]map[string]interface{}
47+
cfg map[string]map[string]any
4848
issuesReporter func(*linter.Context) []Issue
4949
contextSetter func(*linter.Context)
5050
loadMode LoadMode
5151
needUseOriginalPackages bool
5252
}
5353

54-
func NewLinter(name, desc string, analyzers []*analysis.Analyzer, cfg map[string]map[string]interface{}) *Linter {
54+
func NewLinter(name, desc string, analyzers []*analysis.Analyzer, cfg map[string]map[string]any) *Linter {
5555
return &Linter{name: name, desc: desc, analyzers: analyzers, cfg: cfg}
5656
}
5757

@@ -102,7 +102,7 @@ func (lnt *Linter) allAnalyzerNames() []string {
102102
return ret
103103
}
104104

105-
func (lnt *Linter) configureAnalyzer(a *analysis.Analyzer, cfg map[string]interface{}) error {
105+
func (lnt *Linter) configureAnalyzer(a *analysis.Analyzer, cfg map[string]any) error {
106106
for k, v := range cfg {
107107
f := a.Flags.Lookup(k)
108108
if f == nil {
@@ -195,12 +195,12 @@ func allFlagNames(fs *flag.FlagSet) []string {
195195
return ret
196196
}
197197

198-
func valueToString(v interface{}) string {
198+
func valueToString(v any) string {
199199
if ss, ok := v.([]string); ok {
200200
return strings.Join(ss, ",")
201201
}
202202

203-
if is, ok := v.([]interface{}); ok {
203+
if is, ok := v.([]any); ok {
204204
var ss []string
205205
for _, i := range is {
206206
ss = append(ss, fmt.Sprint(i))
@@ -212,6 +212,6 @@ func valueToString(v interface{}) string {
212212
return fmt.Sprint(v)
213213
}
214214

215-
func DummyRun(_ *analysis.Pass) (interface{}, error) {
215+
func DummyRun(_ *analysis.Pass) (any, error) {
216216
return nil, nil
217217
}

‎pkg/golinters/goanalysis/runner_action.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type action struct {
5050
deps []*action
5151
objectFacts map[objectFactKey]analysis.Fact
5252
packageFacts map[packageFactKey]analysis.Fact
53-
result interface{}
53+
result any
5454
diagnostics []analysis.Diagnostic
5555
err error
5656
r *runner
@@ -145,7 +145,7 @@ func (act *action) analyze() {
145145

146146
// Plumb the output values of the dependencies
147147
// into the inputs of this action. Also facts.
148-
inputs := make(map[*analysis.Analyzer]interface{})
148+
inputs := make(map[*analysis.Analyzer]any)
149149
startedAt := time.Now()
150150
for _, dep := range act.deps {
151151
if dep.pkg == act.pkg {

‎pkg/golinters/goanalysis/runner_loadingpackage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ type importerFunc func(path string) (*types.Package, error)
446446

447447
func (f importerFunc) Import(path string) (*types.Package, error) { return f(path) }
448448

449-
func sizeOfValueTreeBytes(v interface{}) int {
449+
func sizeOfValueTreeBytes(v any) int {
450450
return sizeOfReflectValueTreeBytes(reflect.ValueOf(v), map[uintptr]struct{}{})
451451
}
452452

‎pkg/golinters/gochecknoglobals.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func NewGochecknoglobals() *goanalysis.Linter {
1414
// pass the `t` flag as true to the analyzer before running it. This can be
1515
// turned off by using the regular golangci-lint flags such as `--tests` or
1616
// `--skip-files`.
17-
linterConfig := map[string]map[string]interface{}{
17+
linterConfig := map[string]map[string]any{
1818
gochecknoglobals.Name: {
1919
"t": true,
2020
},

‎pkg/golinters/gochecknoinits.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func NewGochecknoinits() *goanalysis.Linter {
2222
analyzer := &analysis.Analyzer{
2323
Name: gochecknoinitsName,
2424
Doc: goanalysis.TheOnlyanalyzerDoc,
25-
Run: func(pass *analysis.Pass) (interface{}, error) {
25+
Run: func(pass *analysis.Pass) (any, error) {
2626
var res []goanalysis.Issue
2727
for _, file := range pass.Files {
2828
fileIssues := checkFileForInits(file, pass.Fset)

‎pkg/golinters/gocognit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func NewGocognit(settings *config.GocognitSettings) *goanalysis.Linter {
2424
analyzer := &analysis.Analyzer{
2525
Name: goanalysis.TheOnlyAnalyzerName,
2626
Doc: goanalysis.TheOnlyanalyzerDoc,
27-
Run: func(pass *analysis.Pass) (interface{}, error) {
27+
Run: func(pass *analysis.Pass) (any, error) {
2828
issues := runGocognit(pass, settings)
2929

3030
if len(issues) == 0 {

‎pkg/golinters/goconst.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func NewGoconst(settings *config.GoConstSettings) *goanalysis.Linter {
2323
analyzer := &analysis.Analyzer{
2424
Name: goconstName,
2525
Doc: goanalysis.TheOnlyanalyzerDoc,
26-
Run: func(pass *analysis.Pass) (interface{}, error) {
26+
Run: func(pass *analysis.Pass) (any, error) {
2727
issues, err := runGoconst(pass, settings)
2828
if err != nil {
2929
return nil, err

0 commit comments

Comments
 (0)