From d1f4bdb583a491dc96b59d1899be7d4736d29428 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 11 Apr 2022 10:32:29 +0200 Subject: [PATCH] chore: update --- pkg/commands/help.go | 2 +- pkg/golinters/goanalysis/adapters.go | 2 +- pkg/lint/lintersdb/enabled_set.go | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/commands/help.go b/pkg/commands/help.go index 677018a6ca3b..a6ed4c84fe01 100644 --- a/pkg/commands/help.go +++ b/pkg/commands/help.go @@ -39,7 +39,7 @@ func (e *Executor) initHelp() { func printLinterConfigs(lcs []*linter.Config) { sort.Slice(lcs, func(i, j int) bool { - return strings.Compare(lcs[i].Name(), lcs[j].Name()) < 0 + return lcs[i].Name() < lcs[j].Name() }) for _, lc := range lcs { altNamesStr := "" diff --git a/pkg/golinters/goanalysis/adapters.go b/pkg/golinters/goanalysis/adapters.go index bd75de3e68f0..284215dfc65d 100644 --- a/pkg/golinters/goanalysis/adapters.go +++ b/pkg/golinters/goanalysis/adapters.go @@ -19,7 +19,7 @@ func MakeFakeLoaderProgram(pass *analysis.Pass) *loader.Program { { Pkg: pass.Pkg, Importable: true, // not used - TransitivelyErrorFree: true, // TODO + TransitivelyErrorFree: true, // TODO ??? Files: pass.Files, Errors: nil, diff --git a/pkg/lint/lintersdb/enabled_set.go b/pkg/lint/lintersdb/enabled_set.go index 9814aa857ea9..907c1c4dbfe9 100644 --- a/pkg/lint/lintersdb/enabled_set.go +++ b/pkg/lint/lintersdb/enabled_set.go @@ -3,7 +3,6 @@ package lintersdb import ( "os" "sort" - "strings" "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" @@ -123,7 +122,7 @@ func (es EnabledSet) GetOptimizedLinters() ([]*linter.Config, error) { if a.DoesChangeTypes != b.DoesChangeTypes { return b.DoesChangeTypes // move type-changing linters to the end to optimize speed } - return strings.Compare(a.Name(), b.Name()) < 0 + return a.Name() < b.Name() }) return resultLinters, nil @@ -168,7 +167,7 @@ func (es EnabledSet) combineGoAnalysisLinters(linters map[string]*linter.Config) return false } - return strings.Compare(a.Name(), b.Name()) <= 0 + return a.Name() <= b.Name() }) ml := goanalysis.NewMetaLinter(goanalysisLinters)