Skip to content

Commit 2bbe9ff

Browse files
jirfagjirfag
committed
Fix funlen crash on cgo
1 parent 0556f6a commit 2bbe9ff

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

‎go.mod

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,9 @@ require (
6565
mvdan.cc/unparam v0.0.0-20190124213536-fbb59629db34
6666
)
6767

68-
// https://github.com/golang/tools/pull/139
69-
replace golang.org/x/tools => github.com/golangci/tools v0.0.0-20190713050349-979bdb7f8cc8
68+
replace (
69+
// https://github.com/ultraware/funlen/pull/1
70+
github.com/ultraware/funlen => github.com/golangci/funlen v0.0.0-20190909161642-5e59b9546114
71+
// https://github.com/golang/tools/pull/139
72+
golang.org/x/tools => github.com/golangci/tools v0.0.0-20190713050349-979bdb7f8cc8
73+
)

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9
5151
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk=
5252
github.com/golangci/errcheck v0.0.0-20181003203344-ef45e06d44b6 h1:i2jIkQFb8RG45DuQs+ElyROY848cSJIoIkBM+7XXypA=
5353
github.com/golangci/errcheck v0.0.0-20181003203344-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0=
54+
github.com/golangci/funlen v0.0.0-20190909161642-5e59b9546114 h1:eubR6yxVUUlbUuBBn1ONXalxuCjCrDfKvRc0eF6Xnio=
55+
github.com/golangci/funlen v0.0.0-20190909161642-5e59b9546114/go.mod h1:kJMYlbyWK6uaK+J3BjNrQMk0t3CgLgsXgQnOlS4iGeg=
5456
github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 h1:9kfjN3AdxcbsZBf8NjltjWihK2QfBBBZuv91cMFfDHw=
5557
github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8=
5658
github.com/golangci/go-tools v0.0.0-20190318055746-e32c54105b7c h1:/7detzz5stiXWPzkTlPTzkBEIIE4WGpppBJYjKqBiPI=
@@ -162,8 +164,6 @@ github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1
162164
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
163165
github.com/timakin/bodyclose v0.0.0-00010101000000-87058b9bfcec h1:Ha5Eixh5Dgi14hDFFWsxoB/jR95rHjB1biKdK9VKkbQ=
164166
github.com/timakin/bodyclose v0.0.0-00010101000000-87058b9bfcec/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
165-
github.com/ultraware/funlen v0.0.1 h1:UeC9tpM4wNWzUJfan8z9sFE4QCzjjzlCZmuJN+aOkH0=
166-
github.com/ultraware/funlen v0.0.1/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
167167
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
168168
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
169169
github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=

‎test/run_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ func TestTestsAreLintedByDefault(t *testing.T) {
5454
}
5555

5656
func TestCgoOk(t *testing.T) {
57-
testshared.NewLintRunner(t).Run("--enable-all", getTestDataDir("cgo")).ExpectNoIssues()
57+
testshared.NewLintRunner(t).Run("--no-config", "--enable-all", getTestDataDir("cgo")).ExpectNoIssues()
5858
}
5959

6060
func TestCgoWithIssues(t *testing.T) {
61-
testshared.NewLintRunner(t).Run("--enable-all", getTestDataDir("cgo_with_issues")).
61+
testshared.NewLintRunner(t).Run("--no-config", "--enable-all", getTestDataDir("cgo_with_issues")).
6262
ExpectHasIssue("Printf format %t has arg cs of wrong type")
6363
}
6464

6565
func TestUnsafeOk(t *testing.T) {
66-
testshared.NewLintRunner(t).Run("--enable-all", getTestDataDir("unsafe")).ExpectNoIssues()
66+
testshared.NewLintRunner(t).Run("--no-config", "--enable-all", getTestDataDir("unsafe")).ExpectNoIssues()
6767
}
6868

6969
func TestGovetCustomFormatter(t *testing.T) {
@@ -134,8 +134,8 @@ func TestConfigFileIsDetected(t *testing.T) {
134134

135135
func TestEnableAllFastAndEnableCanCoexist(t *testing.T) {
136136
r := testshared.NewLintRunner(t)
137-
r.Run(withCommonRunArgs("--fast", "--enable-all", "--enable=typecheck")...).ExpectNoIssues()
138-
r.Run(withCommonRunArgs("--enable-all", "--enable=typecheck")...).ExpectExitCode(exitcodes.Failure)
137+
r.Run(withCommonRunArgs("--no-config", "--fast", "--enable-all", "--enable=typecheck")...).ExpectNoIssues()
138+
r.Run(withCommonRunArgs("--no-config", "--enable-all", "--enable=typecheck")...).ExpectExitCode(exitcodes.Failure)
139139
}
140140

141141
func TestEnabledPresetsAreNotDuplicated(t *testing.T) {

‎vendor/github.com/ultraware/funlen/main.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/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ github.com/stretchr/testify/assert
183183
github.com/stretchr/testify/require
184184
# github.com/timakin/bodyclose v0.0.0-00010101000000-87058b9bfcec
185185
github.com/timakin/bodyclose/passes/bodyclose
186-
# github.com/ultraware/funlen v0.0.1
186+
# github.com/ultraware/funlen v0.0.1 => github.com/golangci/funlen v0.0.0-20190909161642-5e59b9546114
187187
github.com/ultraware/funlen
188188
# github.com/valyala/bytebufferpool v1.0.0
189189
github.com/valyala/bytebufferpool

0 commit comments

Comments
 (0)