From 6d786b50ae10ea8d6b2ffa079b5928253653319e Mon Sep 17 00:00:00 2001 From: Trevor Pounds Date: Fri, 27 Sep 2019 20:58:49 -0400 Subject: [PATCH] Group imports by package. --- internal/errorutil/errors.go | 4 +++- internal/pkgcache/pkgcache.go | 6 ++---- pkg/commands/config.go | 3 +-- pkg/commands/executor.go | 9 +++------ pkg/commands/run.go | 5 ++--- pkg/config/reader.go | 3 +-- pkg/fsutils/filecache.go | 4 ++-- pkg/golinters/depguard.go | 18 ++++++++---------- pkg/golinters/errcheck.go | 14 ++++++-------- pkg/golinters/funlen.go | 3 +-- pkg/golinters/goanalysis/runner.go | 12 ++++-------- pkg/golinters/gochecknoglobals.go | 1 - pkg/golinters/gocritic.go | 7 ++----- pkg/golinters/godox.go | 1 - pkg/golinters/gosec.go | 6 ++---- pkg/golinters/govet.go | 7 +++---- pkg/golinters/govet_test.go | 4 ++-- pkg/golinters/ineffassign.go | 6 ++---- pkg/golinters/interfacer.go | 4 +--- pkg/golinters/megacheck.go | 4 ++-- pkg/golinters/unused.go | 3 +-- pkg/golinters/whitespace.go | 3 +-- pkg/lint/lintersdb/enabled_set.go | 3 +-- pkg/lint/lintersdb/manager.go | 1 - pkg/lint/load.go | 9 +++------ pkg/lint/runner.go | 6 ++---- pkg/result/issue.go | 4 +++- pkg/result/processors/exclude_rules.go | 4 +--- pkg/result/processors/exclude_rules_test.go | 3 +-- pkg/result/processors/fixer.go | 9 +++------ pkg/result/processors/max_same_issues.go | 1 - pkg/result/processors/processor.go | 4 +++- pkg/result/processors/uniq_by_line_test.go | 1 - test/bench/bench_test.go | 3 +-- test/data.go | 4 +++- test/linters_test.go | 5 ++--- test/run_test.go | 6 ++---- 37 files changed, 74 insertions(+), 116 deletions(-) diff --git a/internal/errorutil/errors.go b/internal/errorutil/errors.go index 693620e9..5cb86d66 100644 --- a/internal/errorutil/errors.go +++ b/internal/errorutil/errors.go @@ -1,6 +1,8 @@ package errorutil -import "fmt" +import ( + "fmt" +) // PanicError can be used to not print stacktrace twice type PanicError struct { diff --git a/internal/pkgcache/pkgcache.go b/internal/pkgcache/pkgcache.go index b2c481b5..79da2808 100644 --- a/internal/pkgcache/pkgcache.go +++ b/internal/pkgcache/pkgcache.go @@ -9,14 +9,12 @@ import ( "sort" "sync" - "github.com/golangci/golangci-lint/pkg/logutils" - - "github.com/golangci/golangci-lint/pkg/timeutils" - "github.com/pkg/errors" "golang.org/x/tools/go/packages" "github.com/golangci/golangci-lint/internal/cache" + "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/pkg/timeutils" ) // Cache is a per-package data cache. A cached data is invalidated when diff --git a/pkg/commands/config.go b/pkg/commands/config.go index a1d1bd9b..807f1ca4 100644 --- a/pkg/commands/config.go +++ b/pkg/commands/config.go @@ -4,12 +4,11 @@ import ( "fmt" "os" + "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/golangci/golangci-lint/pkg/exitcodes" "github.com/golangci/golangci-lint/pkg/fsutils" - - "github.com/spf13/cobra" ) func (e *Executor) initConfig() { diff --git a/pkg/commands/executor.go b/pkg/commands/executor.go index 0fad8f76..42b179db 100644 --- a/pkg/commands/executor.go +++ b/pkg/commands/executor.go @@ -5,19 +5,16 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load" - "github.com/golangci/golangci-lint/internal/pkgcache" - "github.com/golangci/golangci-lint/pkg/timeutils" - - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/pkg/fsutils" + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load" "github.com/golangci/golangci-lint/pkg/goutil" "github.com/golangci/golangci-lint/pkg/lint" "github.com/golangci/golangci-lint/pkg/lint/lintersdb" "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/report" + "github.com/golangci/golangci-lint/pkg/timeutils" ) type Executor struct { diff --git a/pkg/commands/run.go b/pkg/commands/run.go index 8db58608..1a773a2e 100644 --- a/pkg/commands/run.go +++ b/pkg/commands/run.go @@ -10,9 +10,6 @@ import ( "strings" "time" - "github.com/golangci/golangci-lint/pkg/packages" - "github.com/golangci/golangci-lint/pkg/result/processors" - "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -23,8 +20,10 @@ import ( "github.com/golangci/golangci-lint/pkg/lint" "github.com/golangci/golangci-lint/pkg/lint/lintersdb" "github.com/golangci/golangci-lint/pkg/logutils" + "github.com/golangci/golangci-lint/pkg/packages" "github.com/golangci/golangci-lint/pkg/printers" "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/pkg/result/processors" ) func getDefaultIssueExcludeHelp() string { diff --git a/pkg/config/reader.go b/pkg/config/reader.go index 9a19b524..1e355e72 100644 --- a/pkg/config/reader.go +++ b/pkg/config/reader.go @@ -7,12 +7,11 @@ import ( "path/filepath" "strings" + homedir "github.com/mitchellh/go-homedir" "github.com/spf13/viper" "github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/logutils" - - homedir "github.com/mitchellh/go-homedir" ) type FileReader struct { diff --git a/pkg/fsutils/filecache.go b/pkg/fsutils/filecache.go index 8e4d8c32..b3c28242 100644 --- a/pkg/fsutils/filecache.go +++ b/pkg/fsutils/filecache.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "sync" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/pkg/errors" + + "github.com/golangci/golangci-lint/pkg/logutils" ) type FileCache struct { diff --git a/pkg/golinters/depguard.go b/pkg/golinters/depguard.go index 4a09cd05..1b73fc07 100644 --- a/pkg/golinters/depguard.go +++ b/pkg/golinters/depguard.go @@ -5,33 +5,31 @@ import ( "strings" "sync" + "github.com/OpenPeeDeeP/depguard" "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/loader" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - - depguardAPI "github.com/OpenPeeDeeP/depguard" - "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) -func setDepguardListType(dg *depguardAPI.Depguard, lintCtx *linter.Context) error { +func setDepguardListType(dg *depguard.Depguard, lintCtx *linter.Context) error { listType := lintCtx.Settings().Depguard.ListType var found bool - dg.ListType, found = depguardAPI.StringToListType[strings.ToLower(listType)] + dg.ListType, found = depguard.StringToListType[strings.ToLower(listType)] if !found { if listType != "" { return fmt.Errorf("unsure what list type %s is", listType) } - dg.ListType = depguardAPI.LTBlacklist + dg.ListType = depguard.LTBlacklist } return nil } -func setupDepguardPackages(dg *depguardAPI.Depguard, lintCtx *linter.Context) { - if dg.ListType == depguardAPI.LTBlacklist { +func setupDepguardPackages(dg *depguard.Depguard, lintCtx *linter.Context) { + if dg.ListType == depguard.LTBlacklist { // if the list type was a blacklist the packages with error messages should // be included in the blacklist package list @@ -66,7 +64,7 @@ func NewDepguard() *goanalysis.Linter { dgSettings := &lintCtx.Settings().Depguard analyzer.Run = func(pass *analysis.Pass) (interface{}, error) { prog := goanalysis.MakeFakeLoaderProgram(pass) - dg := &depguardAPI.Depguard{ + dg := &depguard.Depguard{ Packages: dgSettings.Packages, IncludeGoRoot: dgSettings.IncludeGoRoot, } @@ -87,7 +85,7 @@ func NewDepguard() *goanalysis.Linter { return nil, nil } msgSuffix := "is in the blacklist" - if dg.ListType == depguardAPI.LTWhitelist { + if dg.ListType == depguard.LTWhitelist { msgSuffix = "is not in the whitelist" } res := make([]result.Issue, 0, len(issues)) diff --git a/pkg/golinters/errcheck.go b/pkg/golinters/errcheck.go index 03f572ea..0e1a94d3 100644 --- a/pkg/golinters/errcheck.go +++ b/pkg/golinters/errcheck.go @@ -10,15 +10,13 @@ import ( "strings" "sync" - "golang.org/x/tools/go/analysis" - - "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - - errcheckAPI "github.com/golangci/errcheck/golangci" + errcheck "github.com/golangci/errcheck/golangci" "github.com/pkg/errors" + "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/fsutils" + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) @@ -44,7 +42,7 @@ func NewErrcheck() *goanalysis.Linter { if err != nil { return nil, err } - errcheckIssues, err := errcheckAPI.RunWithConfig(prog, errCfg) + errcheckIssues, err := errcheck.RunWithConfig(prog, errCfg) if err != nil { return nil, err } @@ -106,13 +104,13 @@ func parseIgnoreConfig(s string) (map[string]*regexp.Regexp, error) { return cfg, nil } -func genConfig(errCfg *config.ErrcheckSettings) (*errcheckAPI.Config, error) { +func genConfig(errCfg *config.ErrcheckSettings) (*errcheck.Config, error) { ignoreConfig, err := parseIgnoreConfig(errCfg.Ignore) if err != nil { return nil, errors.Wrap(err, "failed to parse 'ignore' directive") } - c := &errcheckAPI.Config{ + c := &errcheck.Config{ Ignore: ignoreConfig, Blank: errCfg.CheckAssignToBlank, Asserts: errCfg.CheckTypeAssertions, diff --git a/pkg/golinters/funlen.go b/pkg/golinters/funlen.go index ee9782db..d00485f1 100644 --- a/pkg/golinters/funlen.go +++ b/pkg/golinters/funlen.go @@ -5,13 +5,12 @@ import ( "strings" "sync" + "github.com/ultraware/funlen" "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - - "github.com/ultraware/funlen" ) const funlenLinterName = "funlen" diff --git a/pkg/golinters/goanalysis/runner.go b/pkg/golinters/goanalysis/runner.go index 4cbc5e4b..4f730a00 100644 --- a/pkg/golinters/goanalysis/runner.go +++ b/pkg/golinters/goanalysis/runner.go @@ -28,20 +28,16 @@ import ( "sync/atomic" "time" - "golang.org/x/tools/go/types/objectpath" - + "github.com/pkg/errors" + "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/gcexportdata" + "golang.org/x/tools/go/packages" + "golang.org/x/tools/go/types/objectpath" "github.com/golangci/golangci-lint/internal/errorutil" "github.com/golangci/golangci-lint/internal/pkgcache" - "github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load" "github.com/golangci/golangci-lint/pkg/logutils" - - "github.com/pkg/errors" - - "golang.org/x/tools/go/analysis" - "golang.org/x/tools/go/packages" ) var ( diff --git a/pkg/golinters/gochecknoglobals.go b/pkg/golinters/gochecknoglobals.go index a1be60b3..244ebfc3 100644 --- a/pkg/golinters/gochecknoglobals.go +++ b/pkg/golinters/gochecknoglobals.go @@ -10,7 +10,6 @@ import ( "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/golinters/gocritic.go b/pkg/golinters/gocritic.go index 0b24e7dd..d040c44d 100644 --- a/pkg/golinters/gocritic.go +++ b/pkg/golinters/gocritic.go @@ -10,14 +10,11 @@ import ( "strings" "sync" + "github.com/go-lintpack/lintpack" "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - "github.com/golangci/golangci-lint/pkg/config" - - "github.com/go-lintpack/lintpack" - + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/golinters/godox.go b/pkg/golinters/godox.go index 5c8d5921..0bde9ff2 100644 --- a/pkg/golinters/godox.go +++ b/pkg/golinters/godox.go @@ -6,7 +6,6 @@ import ( "sync" "github.com/matoous/godox" - "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" diff --git a/pkg/golinters/gosec.go b/pkg/golinters/gosec.go index 75f04a3b..e3551908 100644 --- a/pkg/golinters/gosec.go +++ b/pkg/golinters/gosec.go @@ -8,14 +8,12 @@ import ( "strconv" "sync" + "github.com/securego/gosec" + "github.com/securego/gosec/rules" "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/packages" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - - "github.com/securego/gosec" - "github.com/securego/gosec/rules" - "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/golinters/govet.go b/pkg/golinters/govet.go index 1dec50d9..fdfa935e 100644 --- a/pkg/golinters/govet.go +++ b/pkg/golinters/govet.go @@ -3,10 +3,6 @@ package golinters import ( "golang.org/x/tools/go/analysis" - "github.com/golangci/golangci-lint/pkg/config" - - "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - // analysis plug-ins "golang.org/x/tools/go/analysis/passes/asmdecl" "golang.org/x/tools/go/analysis/passes/assign" @@ -40,6 +36,9 @@ import ( "golang.org/x/tools/go/analysis/passes/unreachable" "golang.org/x/tools/go/analysis/passes/unsafeptr" "golang.org/x/tools/go/analysis/passes/unusedresult" + + "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" ) func getAllAnalyzers() []*analysis.Analyzer { diff --git a/pkg/golinters/govet_test.go b/pkg/golinters/govet_test.go index 65c6ca32..1376292b 100644 --- a/pkg/golinters/govet_test.go +++ b/pkg/golinters/govet_test.go @@ -4,8 +4,6 @@ import ( "sort" "testing" - "github.com/golangci/golangci-lint/pkg/config" - "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis/passes/asmdecl" "golang.org/x/tools/go/analysis/passes/assign" @@ -14,6 +12,8 @@ import ( "golang.org/x/tools/go/analysis/passes/buildtag" "golang.org/x/tools/go/analysis/passes/cgocall" "golang.org/x/tools/go/analysis/passes/shadow" + + "github.com/golangci/golangci-lint/pkg/config" ) func TestGovet(t *testing.T) { diff --git a/pkg/golinters/ineffassign.go b/pkg/golinters/ineffassign.go index e0df64c0..fbc179a7 100644 --- a/pkg/golinters/ineffassign.go +++ b/pkg/golinters/ineffassign.go @@ -4,12 +4,10 @@ import ( "fmt" "sync" + "github.com/golangci/ineffassign" "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - - ineffassignAPI "github.com/golangci/ineffassign" - "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) @@ -37,7 +35,7 @@ func NewIneffassign() *goanalysis.Linter { fileNames = append(fileNames, pos.Filename) } - issues := ineffassignAPI.Run(fileNames) + issues := ineffassign.Run(fileNames) if len(issues) == 0 { return nil, nil } diff --git a/pkg/golinters/interfacer.go b/pkg/golinters/interfacer.go index 9cb74799..485d35ee 100644 --- a/pkg/golinters/interfacer.go +++ b/pkg/golinters/interfacer.go @@ -5,11 +5,9 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis/passes/buildssa" - - "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - "mvdan.cc/interfacer/check" + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/golinters/megacheck.go b/pkg/golinters/megacheck.go index 0c174568..85621f6f 100644 --- a/pkg/golinters/megacheck.go +++ b/pkg/golinters/megacheck.go @@ -3,9 +3,9 @@ package golinters import ( "fmt" - "github.com/golangci/golangci-lint/pkg/logutils" - "golang.org/x/tools/go/analysis" + + "github.com/golangci/golangci-lint/pkg/logutils" ) var debugf = logutils.Debug("megacheck") diff --git a/pkg/golinters/unused.go b/pkg/golinters/unused.go index c580e0cf..ab10a286 100644 --- a/pkg/golinters/unused.go +++ b/pkg/golinters/unused.go @@ -4,10 +4,9 @@ import ( "golang.org/x/tools/go/analysis" "honnef.co/go/tools/unused" + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - - "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" ) func NewUnused() *goanalysis.Linter { diff --git a/pkg/golinters/whitespace.go b/pkg/golinters/whitespace.go index 35af0a87..c27fca25 100644 --- a/pkg/golinters/whitespace.go +++ b/pkg/golinters/whitespace.go @@ -5,13 +5,12 @@ import ( "sync" "github.com/pkg/errors" + "github.com/ultraware/whitespace" "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - - "github.com/ultraware/whitespace" ) func NewWhitespace() *goanalysis.Linter { diff --git a/pkg/lint/lintersdb/enabled_set.go b/pkg/lint/lintersdb/enabled_set.go index 8e7caa6e..8339f6f7 100644 --- a/pkg/lint/lintersdb/enabled_set.go +++ b/pkg/lint/lintersdb/enabled_set.go @@ -3,9 +3,8 @@ package lintersdb import ( "sort" - "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/logutils" ) diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go index 07ba6920..72f88573 100644 --- a/pkg/lint/lintersdb/manager.go +++ b/pkg/lint/lintersdb/manager.go @@ -4,7 +4,6 @@ import ( "os" "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/golinters" "github.com/golangci/golangci-lint/pkg/lint/linter" ) diff --git a/pkg/lint/load.go b/pkg/lint/load.go index 95d2d3a0..ff235cac 100644 --- a/pkg/lint/load.go +++ b/pkg/lint/load.go @@ -11,17 +11,14 @@ import ( "strings" "time" - "github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load" - - "github.com/golangci/golangci-lint/internal/pkgcache" - - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/pkg/errors" "golang.org/x/tools/go/packages" + "github.com/golangci/golangci-lint/internal/pkgcache" "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/exitcodes" + "github.com/golangci/golangci-lint/pkg/fsutils" + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load" "github.com/golangci/golangci-lint/pkg/goutil" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/logutils" diff --git a/pkg/lint/runner.go b/pkg/lint/runner.go index f5d6f5b6..fb7324ee 100644 --- a/pkg/lint/runner.go +++ b/pkg/lint/runner.go @@ -7,13 +7,11 @@ import ( "strings" "github.com/golangci/golangci-lint/internal/errorutil" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/goutil" "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/lint/lintersdb" "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/packages" "github.com/golangci/golangci-lint/pkg/result" diff --git a/pkg/result/issue.go b/pkg/result/issue.go index d3499216..7b1df59d 100644 --- a/pkg/result/issue.go +++ b/pkg/result/issue.go @@ -1,6 +1,8 @@ package result -import "go/token" +import ( + "go/token" +) type Range struct { From, To int diff --git a/pkg/result/processors/exclude_rules.go b/pkg/result/processors/exclude_rules.go index 014efcd0..6b16fdc5 100644 --- a/pkg/result/processors/exclude_rules.go +++ b/pkg/result/processors/exclude_rules.go @@ -3,10 +3,8 @@ package processors import ( "regexp" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/fsutils" - + "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/result/processors/exclude_rules_test.go b/pkg/result/processors/exclude_rules_test.go index 8fd4a4d3..ee2f15e1 100644 --- a/pkg/result/processors/exclude_rules_test.go +++ b/pkg/result/processors/exclude_rules_test.go @@ -5,10 +5,9 @@ import ( "path/filepath" "testing" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/stretchr/testify/assert" + "github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/result/processors/fixer.go b/pkg/result/processors/fixer.go index 1e6c1fce..dd2a686a 100644 --- a/pkg/result/processors/fixer.go +++ b/pkg/result/processors/fixer.go @@ -8,16 +8,13 @@ import ( "sort" "strings" - "github.com/golangci/golangci-lint/pkg/timeutils" - - "github.com/golangci/golangci-lint/pkg/fsutils" - - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/pkg/errors" "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/pkg/fsutils" + "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/pkg/timeutils" ) type Fixer struct { diff --git a/pkg/result/processors/max_same_issues.go b/pkg/result/processors/max_same_issues.go index 43a05936..84fdf0c0 100644 --- a/pkg/result/processors/max_same_issues.go +++ b/pkg/result/processors/max_same_issues.go @@ -4,7 +4,6 @@ import ( "sort" "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/result/processors/processor.go b/pkg/result/processors/processor.go index 1daec62e..1a7a4043 100644 --- a/pkg/result/processors/processor.go +++ b/pkg/result/processors/processor.go @@ -1,6 +1,8 @@ package processors -import "github.com/golangci/golangci-lint/pkg/result" +import ( + "github.com/golangci/golangci-lint/pkg/result" +) type Processor interface { Process(issues []result.Issue) ([]result.Issue, error) diff --git a/pkg/result/processors/uniq_by_line_test.go b/pkg/result/processors/uniq_by_line_test.go index 6246f632..31b2cdfa 100644 --- a/pkg/result/processors/uniq_by_line_test.go +++ b/pkg/result/processors/uniq_by_line_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/test/bench/bench_test.go b/test/bench/bench_test.go index 22f53b8a..c18dcd13 100644 --- a/test/bench/bench_test.go +++ b/test/bench/bench_test.go @@ -13,12 +13,11 @@ import ( "testing" "time" - "github.com/golangci/golangci-lint/test/testshared" - gops "github.com/mitchellh/go-ps" "github.com/shirou/gopsutil/process" "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/test/testshared" ) func chdir(b *testing.B, dir string) { diff --git a/test/data.go b/test/data.go index 5cfbdca1..63a6076b 100644 --- a/test/data.go +++ b/test/data.go @@ -1,6 +1,8 @@ package test -import "path/filepath" +import ( + "path/filepath" +) const testdataDir = "testdata" const binName = "../golangci-lint" diff --git a/test/linters_test.go b/test/linters_test.go index 2761fcc1..14ca95ac 100644 --- a/test/linters_test.go +++ b/test/linters_test.go @@ -9,11 +9,10 @@ import ( "strings" "testing" - "github.com/golangci/golangci-lint/test/testshared" - assert "github.com/stretchr/testify/require" - yaml "gopkg.in/yaml.v2" + + "github.com/golangci/golangci-lint/test/testshared" ) func runGoErrchk(c *exec.Cmd, files []string, t *testing.T) { diff --git a/test/run_test.go b/test/run_test.go index bd68f010..30fe6a09 100644 --- a/test/run_test.go +++ b/test/run_test.go @@ -6,12 +6,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - - "github.com/golangci/golangci-lint/test/testshared" + _ "github.com/valyala/quicktemplate" "github.com/golangci/golangci-lint/pkg/exitcodes" - - _ "github.com/valyala/quicktemplate" + "github.com/golangci/golangci-lint/test/testshared" ) func getCommonRunArgs() []string {