Skip to content

Commit a68a88e

Browse files
authored
build(deps): bump honnef.co/go/tools from v0.1.4 to v0.2.0 (#2019)
1 parent 2dcc761 commit a68a88e

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ require (
8484
github.com/yeya24/promlinter v0.1.0
8585
golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4
8686
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
87-
honnef.co/go/tools v0.1.4
87+
honnef.co/go/tools v0.2.0
8888
mvdan.cc/gofumpt v0.1.1
8989
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed
9090
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect

go.sum

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

pkg/golinters/staticcheck_common.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"unicode"
66

77
"golang.org/x/tools/go/analysis"
8+
"honnef.co/go/tools/analysis/lint"
89
scconfig "honnef.co/go/tools/config"
910

1011
"github.com/golangci/golangci-lint/pkg/config"
@@ -27,19 +28,19 @@ func getGoVersion(settings *config.StaticCheckSettings) string {
2728
return "1.13"
2829
}
2930

30-
func setupStaticCheckAnalyzers(src map[string]*analysis.Analyzer, goVersion string, checks []string) []*analysis.Analyzer {
31+
func setupStaticCheckAnalyzers(src []*lint.Analyzer, goVersion string, checks []string) []*analysis.Analyzer {
3132
var names []string
32-
for name := range src {
33-
names = append(names, name)
33+
for _, a := range src {
34+
names = append(names, a.Analyzer.Name)
3435
}
3536

3637
filter := filterAnalyzerNames(names, checks)
3738

3839
var ret []*analysis.Analyzer
39-
for name, a := range src {
40-
if filter[name] {
41-
setAnalyzerGoVersion(a, goVersion)
42-
ret = append(ret, a)
40+
for _, a := range src {
41+
if filter[a.Analyzer.Name] {
42+
setAnalyzerGoVersion(a.Analyzer, goVersion)
43+
ret = append(ret, a.Analyzer)
4344
}
4445
}
4546

pkg/golinters/unused.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ func NewUnused(settings *config.StaticCheckSettings) *goanalysis.Linter {
2525

2626
analyzer := &analysis.Analyzer{
2727
Name: name,
28-
Doc: unused.Analyzer.Doc,
29-
Requires: unused.Analyzer.Requires,
28+
Doc: unused.Analyzer.Analyzer.Doc,
29+
Requires: unused.Analyzer.Analyzer.Requires,
3030
Run: func(pass *analysis.Pass) (interface{}, error) {
31-
res, err := unused.Analyzer.Run(pass)
31+
res, err := unused.Analyzer.Analyzer.Run(pass)
3232
if err != nil {
3333
return nil, err
3434
}

0 commit comments

Comments
 (0)