Skip to content

Commit

Permalink
refactor: enforce map and slice style
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandear committed Nov 15, 2024
1 parent 3378f70 commit 862e775
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion formatter/checkstyle.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion formatter/stylish.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions lint/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
2 changes: 1 addition & 1 deletion lint/linter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions lint/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 (
Expand All @@ -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)
}
Expand Down
4 changes: 4 additions & 0 deletions revive.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions rule/add_constant.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion rule/confusing_naming.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rule/dot_imports.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion rule/empty_block.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion rule/exported.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
2 changes: 1 addition & 1 deletion test/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 862e775

Please sign in to comment.