From 60c55133a6a66cfa245f28c3da236d4fcd8a9a91 Mon Sep 17 00:00:00 2001 From: Trevor Pounds <trevor.pounds@gmail.com> Date: Mon, 30 Dec 2019 08:33:44 -0500 Subject: [PATCH] Fix import order. --- pkg/commands/cache.go | 6 ++---- pkg/commands/executor.go | 6 ++---- pkg/golinters/goanalysis/linter.go | 11 ++++------- pkg/golinters/goanalysis/runner.go | 3 +-- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/pkg/commands/cache.go b/pkg/commands/cache.go index 7fa04e85..359e2d63 100644 --- a/pkg/commands/cache.go +++ b/pkg/commands/cache.go @@ -5,12 +5,10 @@ import ( "os" "path/filepath" - "github.com/golangci/golangci-lint/pkg/fsutils" - - "github.com/golangci/golangci-lint/internal/cache" - "github.com/spf13/cobra" + "github.com/golangci/golangci-lint/internal/cache" + "github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/logutils" ) diff --git a/pkg/commands/executor.go b/pkg/commands/executor.go index 975a3c50..0089bc68 100644 --- a/pkg/commands/executor.go +++ b/pkg/commands/executor.go @@ -11,15 +11,13 @@ import ( "path/filepath" "time" - "github.com/golangci/golangci-lint/internal/cache" - "github.com/fatih/color" + "github.com/gofrs/flock" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/gofrs/flock" - + "github.com/golangci/golangci-lint/internal/cache" "github.com/golangci/golangci-lint/internal/pkgcache" "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/fsutils" diff --git a/pkg/golinters/goanalysis/linter.go b/pkg/golinters/goanalysis/linter.go index bad7ab4f..307a1156 100644 --- a/pkg/golinters/goanalysis/linter.go +++ b/pkg/golinters/goanalysis/linter.go @@ -11,19 +11,16 @@ import ( "sync/atomic" "time" - "github.com/golangci/golangci-lint/pkg/timeutils" - - "github.com/golangci/golangci-lint/internal/pkgcache" - "github.com/golangci/golangci-lint/pkg/logutils" - - "golang.org/x/tools/go/packages" - "github.com/pkg/errors" "golang.org/x/tools/go/analysis" + "golang.org/x/tools/go/packages" + "github.com/golangci/golangci-lint/internal/pkgcache" "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/logutils" libpackages "github.com/golangci/golangci-lint/pkg/packages" "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/golangci-lint/pkg/timeutils" ) const ( diff --git a/pkg/golinters/goanalysis/runner.go b/pkg/golinters/goanalysis/runner.go index 5d8470db..97c7f313 100644 --- a/pkg/golinters/goanalysis/runner.go +++ b/pkg/golinters/goanalysis/runner.go @@ -28,8 +28,6 @@ import ( "sync/atomic" "time" - "github.com/golangci/golangci-lint/pkg/timeutils" - "github.com/pkg/errors" "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/gcexportdata" @@ -40,6 +38,7 @@ import ( "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/golangci/golangci-lint/pkg/timeutils" ) var (