Skip to content

Commit c02a6da

Browse files
committed
Fix #263: fix goimports performance with modules
Apply https://go-review.googlesource.com/c/tools/+/132598/ as a temporary fix before a proper fix is in golang.org/x/tools
1 parent a4d7d7a commit c02a6da

23 files changed

+12490
-29
lines changed

Gopkg.lock

Lines changed: 10 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/golangci/go-tools v0.0.0-20180902103155-93eecd106a0b
1818
github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3
1919
github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee
20-
github.com/golangci/gofmt v0.0.0-20180506063654-2076e05ced53
20+
github.com/golangci/gofmt v0.0.0-20180506063654-f021c4179c82
2121
github.com/golangci/gosec v0.0.0-20180901114220-8afd9cbb6cfb
2222
github.com/golangci/govet v0.0.0-20180818181408-44ddbe260190
2323
github.com/golangci/ineffassign v0.0.0-20180808204949-2ee8f2867dde
@@ -28,7 +28,7 @@ require (
2828
github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770
2929
github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21
3030
github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0
31-
github.com/golangci/tools v0.0.0-20180902102414-01dd7756e01d
31+
github.com/golangci/tools v0.0.0-20180902102414-ed64e33c8c8b
3232
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4
3333
github.com/golangci/unparam v0.0.0-20180902112548-7ad9dbcccc16
3434
github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
@@ -56,7 +56,7 @@ require (
5656
github.com/spf13/viper v1.0.2
5757
github.com/stretchr/testify v1.2.1
5858
golang.org/x/crypto v0.0.0-20180505025534-4ec37c66abab // indirect
59-
golang.org/x/tools v0.0.0-20180831211245-f60e5f99f081
59+
golang.org/x/tools v0.0.0-20180831211245-6c7e314b6563
6060
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
6161
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
6262
sourcegraph.com/sourcegraph/go-diff v0.0.0-20171119081133-3f415a150aec

go.sum

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee h1:J2XAy40+7yz70u
3838
github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU=
3939
github.com/golangci/gofmt v0.0.0-20180506063654-2076e05ced53 h1:8jBcdanEIu0YqTWHt9SUjObv3T0WnlTcmo/ZYm7qkRM=
4040
github.com/golangci/gofmt v0.0.0-20180506063654-2076e05ced53/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU=
41+
github.com/golangci/gofmt v0.0.0-20180506063654-231c3e6dba99/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU=
42+
github.com/golangci/gofmt v0.0.0-20180506063654-f021c4179c82/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU=
4143
github.com/golangci/gosec v0.0.0-20180901114220-8afd9cbb6cfb h1:Bi7BYmZVg4C+mKGi8LeohcP2GGUl2XJD4xCkJoZSaYc=
4244
github.com/golangci/gosec v0.0.0-20180901114220-8afd9cbb6cfb/go.mod h1:ON/c2UR0VAAv6ZEAFKhjCLplESSmRFfZcDLASbI1GWo=
4345
github.com/golangci/govet v0.0.0-20180818181408-44ddbe260190 h1:SLIgprnxQNjBpkz55PK1vfb64/gKU/TgVi0obFw8Lec=
@@ -62,6 +64,7 @@ github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunE
6264
github.com/golangci/tools v0.0.0-20180902102414-01dd7756e01d/go.mod h1:zgj6NOYXOC1cexsdtDceI4/mj3aXK4JOVg9AV3C5LWI=
6365
github.com/golangci/tools v0.0.0-20180902102414-98e75f53b4b9 h1:JGHGJqnbD9OMyjgQqyja7DZd0/to1LKFpN31Fq8byxc=
6466
github.com/golangci/tools v0.0.0-20180902102414-98e75f53b4b9/go.mod h1:zgj6NOYXOC1cexsdtDceI4/mj3aXK4JOVg9AV3C5LWI=
67+
github.com/golangci/tools v0.0.0-20180902102414-ed64e33c8c8b/go.mod h1:zgj6NOYXOC1cexsdtDceI4/mj3aXK4JOVg9AV3C5LWI=
6568
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys=
6669
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ=
6770
github.com/golangci/unparam v0.0.0-20180902112548-7ad9dbcccc16 h1:QURX/XMP2uJUzzEvfJ291v1snmbJuyznAJLSQVnPyko=
@@ -135,8 +138,10 @@ golang.org/x/tools v0.0.0-20180826000951-f6ba57429505/go.mod h1:n7NCudcB/nEzxVGm
135138
golang.org/x/tools v0.0.0-20180831211245-3e7aa9e59977/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
136139
golang.org/x/tools v0.0.0-20180831211245-5d4988d199e2 h1:DpCOQ3KV1qfJ60hZlyxHUgKvOehh5A/F9Fznu08v5Yw=
137140
golang.org/x/tools v0.0.0-20180831211245-5d4988d199e2/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
141+
golang.org/x/tools v0.0.0-20180831211245-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
138142
golang.org/x/tools v0.0.0-20180831211245-7ca132754999 h1:mf2VYfMpSMTlp0I/UXrX13w5LejDx34QeUUHH4TrUA8=
139143
golang.org/x/tools v0.0.0-20180831211245-7ca132754999/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
144+
golang.org/x/tools v0.0.0-20180831211245-96e9e165b75e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
140145
golang.org/x/tools v0.0.0-20180831211245-f60e5f99f081/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
141146
gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
142147
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=

test/linters_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ func TestGolintConsumesXTestFiles(t *testing.T) {
9696
const expIssue = "if block ends with a return statement, so drop this else and outdent its block"
9797

9898
out, ec := runGolangciLint(t, "--no-config", "--disable-all", "-Egolint", dir)
99-
assert.Equal(t, exitcodes.IssuesFound, ec)
99+
assert.Equal(t, exitcodes.IssuesFound, ec, out)
100100
assert.Contains(t, out, expIssue)
101101

102102
out, ec = runGolangciLint(t, "--no-config", "--disable-all", "-Egolint", filepath.Join(dir, "p_test.go"))
103-
assert.Equal(t, exitcodes.IssuesFound, ec)
103+
assert.Equal(t, exitcodes.IssuesFound, ec, out)
104104
assert.Contains(t, out, expIssue)
105105
}

vendor/github.com/golangci/gofmt/goimports/goimports.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golangci/gofmt/goimports/golangci.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)