From b307cc37657c4ccbbe9f3f19adb85b327328ddff Mon Sep 17 00:00:00 2001 From: Cezar Sa Espinola Date: Tue, 16 Oct 2018 10:01:14 -0300 Subject: [PATCH] Fix formatting with updated goimports version --- pkg/golinters/interfacer.go | 3 +-- pkg/golinters/megacheck.go | 5 ++--- pkg/golinters/utils.go | 3 +-- pkg/lint/load.go | 5 ++--- pkg/lint/load_test.go | 5 ++--- pkg/logutils/log_mock.go | 3 ++- pkg/result/processors/nolint.go | 3 +-- test/run_test.go | 1 - 8 files changed, 11 insertions(+), 17 deletions(-) diff --git a/pkg/golinters/interfacer.go b/pkg/golinters/interfacer.go index b8f7f8c4..2f8e8779 100644 --- a/pkg/golinters/interfacer.go +++ b/pkg/golinters/interfacer.go @@ -3,10 +3,9 @@ package golinters import ( "context" - "github.com/golangci/interfacer/check" - "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/interfacer/check" ) type Interfacer struct{} diff --git a/pkg/golinters/megacheck.go b/pkg/golinters/megacheck.go index 1e03a8f6..792fd61f 100644 --- a/pkg/golinters/megacheck.go +++ b/pkg/golinters/megacheck.go @@ -11,12 +11,11 @@ import ( "github.com/golangci/go-tools/simple" "github.com/golangci/go-tools/staticcheck" "github.com/golangci/go-tools/unused" - "github.com/golangci/tools/go/ssa" - "golang.org/x/tools/go/loader" - "github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" + "github.com/golangci/tools/go/ssa" + "golang.org/x/tools/go/loader" ) type Megacheck struct { diff --git a/pkg/golinters/utils.go b/pkg/golinters/utils.go index 1946f434..fe9ef1be 100644 --- a/pkg/golinters/utils.go +++ b/pkg/golinters/utils.go @@ -8,10 +8,9 @@ import ( "strings" "sync" + "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/packages" - - "github.com/golangci/golangci-lint/pkg/config" ) func formatCode(code string, _ *config.Config) string { diff --git a/pkg/lint/load.go b/pkg/lint/load.go index 0548411c..225aeed4 100644 --- a/pkg/lint/load.go +++ b/pkg/lint/load.go @@ -10,14 +10,13 @@ import ( "strings" "time" + "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/goutils" - "github.com/golangci/golangci-lint/pkg/logutils" - - "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/lint/astcache" "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/packages" "github.com/golangci/tools/go/ssa" "github.com/golangci/tools/go/ssa/ssautil" diff --git a/pkg/lint/load_test.go b/pkg/lint/load_test.go index d7469f65..b38a45ba 100644 --- a/pkg/lint/load_test.go +++ b/pkg/lint/load_test.go @@ -3,12 +3,11 @@ package lint import ( "testing" - "github.com/golangci/golangci-lint/pkg/golinters" - "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/pkg/golinters" "github.com/golangci/golangci-lint/pkg/lint/astcache" "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/packages" "github.com/stretchr/testify/assert" ) diff --git a/pkg/logutils/log_mock.go b/pkg/logutils/log_mock.go index 0477ee17..5e7a50c2 100644 --- a/pkg/logutils/log_mock.go +++ b/pkg/logutils/log_mock.go @@ -4,8 +4,9 @@ package logutils import ( - gomock "github.com/golang/mock/gomock" reflect "reflect" + + gomock "github.com/golang/mock/gomock" ) // MockLog is a mock of Log interface diff --git a/pkg/result/processors/nolint.go b/pkg/result/processors/nolint.go index 27ed6ee6..fde3fd78 100644 --- a/pkg/result/processors/nolint.go +++ b/pkg/result/processors/nolint.go @@ -7,9 +7,8 @@ import ( "sort" "strings" - "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/golangci/golangci-lint/pkg/lint/astcache" + "github.com/golangci/golangci-lint/pkg/lint/lintersdb" "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/test/run_test.go b/test/run_test.go index 585fdbed..ba5e5a12 100644 --- a/test/run_test.go +++ b/test/run_test.go @@ -15,7 +15,6 @@ import ( "github.com/golangci/golangci-lint/pkg/exitcodes" "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - "github.com/stretchr/testify/assert" )