Skip to content

Commit 2c69ef2

Browse files
committed
Update megacheck (staticcheck) to 2019.1.1
Relates to #418
1 parent 8319caf commit 2c69ef2

File tree

15 files changed

+265
-613
lines changed

15 files changed

+265
-613
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a
1515
github.com/golangci/errcheck v0.0.0-20181003203344-ef45e06d44b6
1616
github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613
17-
github.com/golangci/go-tools v0.0.0-20180109140146-35a9f45a5db0
17+
github.com/golangci/go-tools v0.0.0-20180109140146-af6baa5dc196
1818
github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3
1919
github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee
2020
github.com/golangci/gofmt v0.0.0-20181105071733-0b8337e80d98

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ github.com/golangci/errcheck v0.0.0-20181003203344-ef45e06d44b6 h1:i2jIkQFb8RG45
4848
github.com/golangci/errcheck v0.0.0-20181003203344-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0=
4949
github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 h1:9kfjN3AdxcbsZBf8NjltjWihK2QfBBBZuv91cMFfDHw=
5050
github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8=
51-
github.com/golangci/go-tools v0.0.0-20180109140146-35a9f45a5db0 h1:tYc7NX0EeSyW9wFF0EXPB57lAiKRPwKZxVkaTsGuB9k=
52-
github.com/golangci/go-tools v0.0.0-20180109140146-35a9f45a5db0/go.mod h1:unzUULGw35sjyOYjUt0jMTXqHlZPpPc6e+xfO4cd6mM=
51+
github.com/golangci/go-tools v0.0.0-20180109140146-af6baa5dc196 h1:9rtVlONXLF1rJZzvLt4tfOXtnAFUEhxCJ64Ibzj6ECo=
52+
github.com/golangci/go-tools v0.0.0-20180109140146-af6baa5dc196/go.mod h1:unzUULGw35sjyOYjUt0jMTXqHlZPpPc6e+xfO4cd6mM=
5353
github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3 h1:pe9JHs3cHHDQgOFXJJdYkK6fLz2PWyYtP4hthoCMvs8=
5454
github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod h1:JXrF4TWy4tXYn62/9x8Wm/K/dm06p8tCKwFRDPZG/1o=
5555
github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee h1:J2XAy40+7yz70uaOiMbNnluTg7gyQhtGqLQncQh+4J8=

test/testdata/gosimple.go

+18-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
//args: -Egosimple
22
package testdata
33

4-
import "strings"
4+
import (
5+
"log"
6+
)
57

6-
func Gosimple(id1, s1 string) string {
7-
if strings.HasPrefix(id1, s1) { // ERROR "should replace.*with.*strings.TrimPrefix"
8-
id1 = strings.TrimPrefix(id1, s1)
8+
func Gosimple(ss []string) {
9+
if ss != nil { // ERROR "S1031: unnecessary nil check around range"
10+
for _, s := range ss {
11+
log.Printf(s)
12+
}
913
}
10-
return id1
1114
}
1215

13-
func GosimpleNolintGosimple(id1, s1 string) string {
14-
if strings.HasPrefix(id1, s1) { //nolint:gosimple
15-
id1 = strings.TrimPrefix(id1, s1)
16+
func GosimpleNolintGosimple(ss []string) {
17+
if ss != nil { //nolint:gosimple
18+
for _, s := range ss {
19+
log.Printf(s)
20+
}
1621
}
17-
return id1
1822
}
1923

20-
func GosimpleNolintMegacheck(id1, s1 string) string {
21-
if strings.HasPrefix(id1, s1) { //nolint:megacheck
22-
id1 = strings.TrimPrefix(id1, s1)
24+
func GosimpleNolintMegacheck(ss []string) {
25+
if ss != nil { //nolint:megacheck
26+
for _, s := range ss {
27+
log.Printf(s)
28+
}
2329
}
24-
return id1
2530
}

test/testdata/stylecheck.go

+21-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,34 @@
22
package testdata
33

44
func Stylecheck(x int) {
5-
if 0 == x { // ERROR "don't use Yoda conditions"
6-
panic(x)
5+
switch x {
6+
case 1:
7+
return
8+
default: // ERROR "ST1015: default case should be first or last in switch statement"
9+
return
10+
case 2:
11+
return
712
}
813
}
914

1015
func StylecheckNolintStylecheck(x int) {
11-
if 0 == x { //nolint:stylecheck
12-
panic(x)
16+
switch x {
17+
case 1:
18+
return
19+
default: //nolint:stylecheck
20+
return
21+
case 2:
22+
return
1323
}
1424
}
1525

1626
func StylecheckNolintMegacheck(x int) {
17-
if 0 == x { //nolint:megacheck // ERROR "don't use Yoda conditions"
18-
panic(x)
27+
switch x {
28+
case 1:
29+
return
30+
default: //nolint:megacheck // ERROR "ST1015: default case should be first or last in switch statement"
31+
return
32+
case 2:
33+
return
1934
}
2035
}

vendor/github.com/golangci/go-tools/arg/arg.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golangci/go-tools/lint/generated.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golangci/go-tools/lint/lintdsl/lintdsl.go

+7-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golangci/go-tools/lint/lintutil/util.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)