From 862e7754b06b7f2feb10afa8aa4e246762dc63f3 Mon Sep 17 00:00:00 2001 From: Oleksandr Redko Date: Fri, 15 Nov 2024 20:55:41 +0200 Subject: [PATCH] refactor: enforce map and slice style --- formatter/checkstyle.go | 2 +- formatter/stylish.go | 2 +- lint/file.go | 4 ++-- lint/linter.go | 2 +- lint/package.go | 12 ++++++------ revive.toml | 4 ++++ rule/add_constant.go | 4 ++-- rule/confusing_naming.go | 2 +- rule/dot_imports.go | 2 +- rule/empty_block.go | 2 +- rule/exported.go | 2 +- test/utils_test.go | 2 +- 12 files changed, 22 insertions(+), 18 deletions(-) diff --git a/formatter/checkstyle.go b/formatter/checkstyle.go index f45b63c92..8fe85fae5 100644 --- a/formatter/checkstyle.go +++ b/formatter/checkstyle.go @@ -45,7 +45,7 @@ func (*Checkstyle) Format(failures <-chan lint.Failure, config lint.Config) (str } fn := failure.GetFilename() if issues[fn] == nil { - issues[fn] = make([]issue, 0) + issues[fn] = []issue{} } issues[fn] = append(issues[fn], iss) } diff --git a/formatter/stylish.go b/formatter/stylish.go index 828228c72..dbd1acf49 100644 --- a/formatter/stylish.go +++ b/formatter/stylish.go @@ -50,7 +50,7 @@ func (*Stylish) Format(failures <-chan lint.Failure, config lint.Config) (string ps = "problem" } - fileReport := make(map[string][][]string) + fileReport := map[string][][]string{} for _, row := range result { if _, ok := fileReport[row[0]]; !ok { diff --git a/lint/file.go b/lint/file.go index e34f8b7f4..c695d63f5 100644 --- a/lint/file.go +++ b/lint/file.go @@ -140,10 +140,10 @@ const ( var re = regexp.MustCompile(directiveRE) func (f *File) disabledIntervals(rules []Rule, mustSpecifyDisableReason bool, failures chan Failure) disabledIntervalsMap { - enabledDisabledRulesMap := make(map[string][]enableDisableConfig) + enabledDisabledRulesMap := map[string][]enableDisableConfig{} getEnabledDisabledIntervals := func() disabledIntervalsMap { - result := make(disabledIntervalsMap) + result := disabledIntervalsMap{} for ruleName, disabledArr := range enabledDisabledRulesMap { ruleResult := []DisabledInterval{} diff --git a/lint/linter.go b/lint/linter.go index b777f9251..10f5cac36 100644 --- a/lint/linter.go +++ b/lint/linter.go @@ -63,7 +63,7 @@ var ( func (l *Linter) Lint(packages [][]string, ruleSet []Rule, config Config) (<-chan Failure, error) { failures := make(chan Failure) - perModVersions := make(map[string]*goversion.Version) + perModVersions := map[string]*goversion.Version{} perPkgVersions := make([]*goversion.Version, len(packages)) for n, files := range packages { if len(files) == 0 { diff --git a/lint/package.go b/lint/package.go index 4a633f35a..873f8a002 100644 --- a/lint/package.go +++ b/lint/package.go @@ -99,10 +99,10 @@ func (p *Package) TypeCheck() error { Importer: importer.Default(), } info := &types.Info{ - Types: make(map[ast.Expr]types.TypeAndValue), - Defs: make(map[*ast.Ident]types.Object), - Uses: make(map[*ast.Ident]types.Object), - Scopes: make(map[ast.Node]*types.Scope), + Types: map[ast.Expr]types.TypeAndValue{}, + Defs: map[*ast.Ident]types.Object{}, + Uses: map[*ast.Ident]types.Object{}, + Scopes: map[ast.Node]*types.Scope{}, } var anyFile *File var astFiles []*ast.File @@ -162,7 +162,7 @@ func (w *walker) Visit(n ast.Node) ast.Visitor { } func (p *Package) scanSortable() { - p.sortable = make(map[string]bool) + p.sortable = map[string]bool{} // bitfield for which methods exist on each type. const ( @@ -171,7 +171,7 @@ func (p *Package) scanSortable() { bfSwap ) nmap := map[string]int{"Len": bfLen, "Less": bfLess, "Swap": bfSwap} - has := make(map[string]int) + has := map[string]int{} for _, f := range p.files { ast.Walk(&walker{nmap, has}, f.AST) } diff --git a/revive.toml b/revive.toml index 304909dcc..58a923381 100644 --- a/revive.toml +++ b/revive.toml @@ -14,6 +14,10 @@ warningCode = 1 [rule.dot-imports] [rule.empty-block] [rule.empty-lines] +[rule.enforce-map-style] + arguments = ["literal"] +[rule.enforce-slice-style] + arguments = ["literal"] [rule.error-naming] [rule.error-return] [rule.error-strings] diff --git a/rule/add_constant.go b/rule/add_constant.go index 399382c8b..a766b5177 100644 --- a/rule/add_constant.go +++ b/rule/add_constant.go @@ -52,11 +52,11 @@ func (r *AddConstantRule) Apply(file *lint.File, arguments lint.Arguments) []lin w := &lintAddConstantRule{ onFailure: onFailure, - strLits: make(map[string]int), + strLits: map[string]int{}, strLitLimit: r.strLitLimit, allowList: r.allowList, ignoreFunctions: r.ignoreFunctions, - structTags: make(map[*ast.BasicLit]struct{}), + structTags: map[*ast.BasicLit]struct{}{}, } ast.Walk(w, file.AST) diff --git a/rule/confusing_naming.go b/rule/confusing_naming.go index 32f6dd803..6a99793e1 100644 --- a/rule/confusing_naming.go +++ b/rule/confusing_naming.go @@ -35,7 +35,7 @@ func (ps *packages) methodNames(lp *lint.Package) pkgMethods { } } - pkgm := pkgMethods{pkg: lp, methods: make(map[string]map[string]*referenceMethod), mu: &sync.Mutex{}} + pkgm := pkgMethods{pkg: lp, methods: map[string]map[string]*referenceMethod{}, mu: &sync.Mutex{}} ps.pkgs = append(ps.pkgs, pkgm) return pkgm diff --git a/rule/dot_imports.go b/rule/dot_imports.go index f6c7fbcfb..03deb4a09 100644 --- a/rule/dot_imports.go +++ b/rule/dot_imports.go @@ -42,7 +42,7 @@ func (*DotImportsRule) Name() string { } func (r *DotImportsRule) configure(arguments lint.Arguments) { - r.allowedPackages = make(allowPackages) + r.allowedPackages = allowPackages{} if len(arguments) == 0 { return } diff --git a/rule/empty_block.go b/rule/empty_block.go index 25a052a0e..ba5652a30 100644 --- a/rule/empty_block.go +++ b/rule/empty_block.go @@ -17,7 +17,7 @@ func (*EmptyBlockRule) Apply(file *lint.File, _ lint.Arguments) []lint.Failure { failures = append(failures, failure) } - w := lintEmptyBlock{make(map[*ast.BlockStmt]bool), onFailure} + w := lintEmptyBlock{map[*ast.BlockStmt]bool{}, onFailure} ast.Walk(w, file.AST) return failures } diff --git a/rule/exported.go b/rule/exported.go index 7ee27b309..b9f1e4687 100644 --- a/rule/exported.go +++ b/rule/exported.go @@ -112,7 +112,7 @@ func (r *ExportedRule) Apply(file *lint.File, args lint.Arguments) []lint.Failur onFailure: func(failure lint.Failure) { failures = append(failures, failure) }, - genDeclMissingComments: make(map[*ast.GenDecl]bool), + genDeclMissingComments: map[*ast.GenDecl]bool{}, stuttersMsg: r.stuttersMsg, disabledChecks: r.disabledChecks, } diff --git a/test/utils_test.go b/test/utils_test.go index c6270dbe6..3687d37c6 100644 --- a/test/utils_test.go +++ b/test/utils_test.go @@ -159,7 +159,7 @@ func parseInstructions(t *testing.T, filename string, src []byte) []instruction } if line == "OK" && ins == nil { // so our return value will be non-nil - ins = make([]instruction, 0) + ins = []instruction{} continue } switch extractDataMode(line) {