Skip to content

Commit c46c1b3

Browse files
tpoundsernado
tpounds
and
ernado
authored
Update to latest x/tools (#930)
* Update to latest x/tools (2020/01/19). Fixes #893 * Initialize vet analyzers as unexportd global vars. Fixes #915 * Support testing Go 1.14beta1. * ci: reset go.mod and go.sum before generated diff check * Update to latest x/tools (2020/02/04) Co-authored-by: Aleksandr Razumov <[email protected]>
1 parent bec0985 commit c46c1b3

File tree

69 files changed

+12517
-11775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+12517
-11775
lines changed

‎.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: go
22
go:
33
- 1.12.x
44
- 1.13.x
5+
- 1.14beta1
56

67
before_script:
78
- nvm install 12.14.0

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ maintainer-clean: clean
5858

5959
check_generated:
6060
$(MAKE) --always-make generate
61-
git checkout -- vendor/modules.txt # can differ between go1.12 and go1.13
61+
git checkout -- vendor/modules.txt go.mod go.sum # can differ between go1.12 and go1.13
6262
git diff --exit-code # check no changes
6363
.PHONY: check_generated
6464

6565
fast_check_generated:
6666
$(MAKE) --always-make fast_generate
67-
git checkout -- vendor/modules.txt # can differ between go1.12 and go1.13
67+
git checkout -- vendor/modules.txt go.mod go.sum # can differ between go1.12 and go1.13
6868
git diff --exit-code # check no changes
6969
.PHONY: fast_check_generated
7070

‎go.mod

+1-5
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,10 @@ require (
4444
github.com/ultraware/whitespace v0.0.4
4545
github.com/uudashr/gocognit v1.0.1
4646
github.com/valyala/quicktemplate v1.2.0
47-
golang.org/x/tools v0.0.0-20200102140908-9497f49d5709
47+
golang.org/x/tools v0.0.0-20200204192400-7124308813f3
4848
gopkg.in/yaml.v2 v2.2.7
4949
honnef.co/go/tools v0.0.1-2019.2.3
5050
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed
5151
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
5252
mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f
5353
)
54-
55-
// https://github.com/golang/tools/pull/156
56-
// https://github.com/golang/tools/pull/160
57-
replace golang.org/x/tools => github.com/golangci/tools v0.0.0-20190915081525-6aa350649b1c

‎go.sum

+32-4
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21 h1:leSNB7iYzLYSS
107107
github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI=
108108
github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0 h1:HVfrLniijszjS1aiNg8JbBMO2+E1WIQ+j/gL4SQqGPg=
109109
github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4=
110-
github.com/golangci/tools v0.0.0-20190915081525-6aa350649b1c h1:JF7g2hV+1F/DwJ3CrSxOc9ZNVY6N8zYt5mB0Qve//fU=
111-
github.com/golangci/tools v0.0.0-20190915081525-6aa350649b1c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
112110
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys=
113111
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ=
114112
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -130,10 +128,10 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
130128
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
131129
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
132130
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
133-
github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3 h1:jNYPNLe3d8smommaoQlK7LOA5ESyUJJ+Wf79ZtA7Vp4=
134-
github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0=
135131
github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a h1:GmsqmapfzSJkm28dhRoHz2tLRbJmqhU86IPgBtN3mmk=
136132
github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s=
133+
github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3 h1:jNYPNLe3d8smommaoQlK7LOA5ESyUJJ+Wf79ZtA7Vp4=
134+
github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0=
137135
github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5 h1:lrdPtrORjGv1HbbEvKWDUAy97mPpFm4B8hp77tcCUJY=
138136
github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
139137
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
@@ -286,14 +284,18 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
286284
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
287285
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
288286
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
287+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
289288
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
290289
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
291290
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
291+
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
292+
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
292293
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
293294
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
294295
golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
295296
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
296297
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
298+
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
297299
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
298300
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
299301
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
@@ -321,10 +323,36 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
321323
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
322324
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
323325
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
326+
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
327+
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
328+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
329+
golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
330+
golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
331+
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
332+
golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
333+
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
334+
golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
335+
golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
336+
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
337+
golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
338+
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
339+
golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
340+
golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
341+
golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
342+
golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
343+
golang.org/x/tools v0.0.0-20200102140908-9497f49d5709 h1:AfG1EmoRkFK24HWWLxSrRKNg2G+oA3JVOG8GJsHWypQ=
344+
golang.org/x/tools v0.0.0-20200102140908-9497f49d5709/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
345+
golang.org/x/tools v0.0.0-20200119215504-eb0d8dd85bcc h1:ZA7KFRdqWZkBr0/YbHm1h08vDJ5gQdjVG/8L153z5c4=
346+
golang.org/x/tools v0.0.0-20200119215504-eb0d8dd85bcc/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
347+
golang.org/x/tools v0.0.0-20200204192400-7124308813f3 h1:Ms82wn6YK4ZycO6Bxyh0kxX3gFFVGo79CCuc52xgcys=
348+
golang.org/x/tools v0.0.0-20200204192400-7124308813f3/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
324349
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
325350
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
351+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
352+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
326353
google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs=
327354
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
355+
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
328356
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
329357
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
330358
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=

‎pkg/golinters/govet.go

+13-27
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,34 @@ package golinters
22

33
import (
44
"golang.org/x/tools/go/analysis"
5-
6-
// analysis plug-ins
75
"golang.org/x/tools/go/analysis/passes/asmdecl"
86
"golang.org/x/tools/go/analysis/passes/assign"
97
"golang.org/x/tools/go/analysis/passes/atomic"
108
"golang.org/x/tools/go/analysis/passes/atomicalign"
119
"golang.org/x/tools/go/analysis/passes/bools"
12-
"golang.org/x/tools/go/analysis/passes/buildssa"
10+
_ "golang.org/x/tools/go/analysis/passes/buildssa" // unused, internal analyzer
1311
"golang.org/x/tools/go/analysis/passes/buildtag"
1412
"golang.org/x/tools/go/analysis/passes/cgocall"
1513
"golang.org/x/tools/go/analysis/passes/composite"
1614
"golang.org/x/tools/go/analysis/passes/copylock"
17-
"golang.org/x/tools/go/analysis/passes/ctrlflow"
15+
_ "golang.org/x/tools/go/analysis/passes/ctrlflow" // unused, internal analyzer
1816
"golang.org/x/tools/go/analysis/passes/deepequalerrors"
1917
"golang.org/x/tools/go/analysis/passes/errorsas"
2018
"golang.org/x/tools/go/analysis/passes/findcall"
2119
"golang.org/x/tools/go/analysis/passes/httpresponse"
22-
"golang.org/x/tools/go/analysis/passes/inspect"
20+
_ "golang.org/x/tools/go/analysis/passes/inspect" // unused internal analyzer
2321
"golang.org/x/tools/go/analysis/passes/loopclosure"
2422
"golang.org/x/tools/go/analysis/passes/lostcancel"
2523
"golang.org/x/tools/go/analysis/passes/nilfunc"
2624
"golang.org/x/tools/go/analysis/passes/nilness"
27-
"golang.org/x/tools/go/analysis/passes/pkgfact"
25+
_ "golang.org/x/tools/go/analysis/passes/pkgfact" // unused, internal analyzer
2826
"golang.org/x/tools/go/analysis/passes/printf"
2927
"golang.org/x/tools/go/analysis/passes/shadow"
3028
"golang.org/x/tools/go/analysis/passes/shift"
3129
"golang.org/x/tools/go/analysis/passes/sortslice"
3230
"golang.org/x/tools/go/analysis/passes/stdmethods"
3331
"golang.org/x/tools/go/analysis/passes/structtag"
32+
"golang.org/x/tools/go/analysis/passes/testinggoroutine"
3433
"golang.org/x/tools/go/analysis/passes/tests"
3534
"golang.org/x/tools/go/analysis/passes/unmarshal"
3635
"golang.org/x/tools/go/analysis/passes/unreachable"
@@ -41,53 +40,40 @@ import (
4140
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
4241
)
4342

44-
func getAllAnalyzers() []*analysis.Analyzer {
45-
var analyzers []*analysis.Analyzer
46-
for _, a := range []*analysis.Analyzer{
43+
var (
44+
allAnalyzers = []*analysis.Analyzer{
4745
asmdecl.Analyzer,
4846
assign.Analyzer,
4947
atomic.Analyzer,
5048
atomicalign.Analyzer,
5149
bools.Analyzer,
52-
buildssa.Analyzer,
5350
buildtag.Analyzer,
5451
cgocall.Analyzer,
5552
composite.Analyzer,
5653
copylock.Analyzer,
57-
ctrlflow.Analyzer,
5854
deepequalerrors.Analyzer,
5955
errorsas.Analyzer,
6056
findcall.Analyzer,
6157
httpresponse.Analyzer,
62-
inspect.Analyzer,
6358
loopclosure.Analyzer,
6459
lostcancel.Analyzer,
6560
nilfunc.Analyzer,
6661
nilness.Analyzer,
67-
pkgfact.Analyzer,
6862
printf.Analyzer,
6963
shadow.Analyzer,
7064
shift.Analyzer,
7165
sortslice.Analyzer,
7266
stdmethods.Analyzer,
7367
structtag.Analyzer,
68+
testinggoroutine.Analyzer,
7469
tests.Analyzer,
7570
unmarshal.Analyzer,
7671
unreachable.Analyzer,
7772
unsafeptr.Analyzer,
7873
unusedresult.Analyzer,
79-
} {
80-
if a.ResultType != nil {
81-
// Skipping internal analyzers.
82-
continue
83-
}
84-
analyzers = append(analyzers, a)
8574
}
86-
return analyzers
87-
}
8875

89-
func getDefaultAnalyzers() []*analysis.Analyzer {
90-
return []*analysis.Analyzer{
76+
defaultAnalyzers = []*analysis.Analyzer{
9177
asmdecl.Analyzer,
9278
assign.Analyzer,
9379
atomic.Analyzer,
@@ -111,7 +97,7 @@ func getDefaultAnalyzers() []*analysis.Analyzer {
11197
unsafeptr.Analyzer,
11298
unusedresult.Analyzer,
11399
}
114-
}
100+
)
115101

116102
func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers []*analysis.Analyzer) bool {
117103
if cfg.EnableAll {
@@ -141,16 +127,16 @@ func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers
141127

142128
func analyzersFromConfig(cfg *config.GovetSettings) []*analysis.Analyzer {
143129
if cfg == nil {
144-
return getDefaultAnalyzers()
130+
return defaultAnalyzers
145131
}
132+
146133
if cfg.CheckShadowing {
147134
// Keeping for backward compatibility.
148135
cfg.Enable = append(cfg.Enable, shadow.Analyzer.Name)
149136
}
150137

151138
var enabledAnalyzers []*analysis.Analyzer
152-
defaultAnalyzers := getDefaultAnalyzers()
153-
for _, a := range getAllAnalyzers() {
139+
for _, a := range allAnalyzers {
154140
if isAnalyzerEnabled(a.Name, cfg, defaultAnalyzers) {
155141
enabledAnalyzers = append(enabledAnalyzers, a)
156142
}

‎pkg/golinters/govet_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ import (
1818

1919
func TestGovet(t *testing.T) {
2020
// Checking that every default analyzer is in "all analyzers" list.
21-
allAnalyzers := getAllAnalyzers()
22-
checkList := append(getDefaultAnalyzers(),
21+
checkList := append(defaultAnalyzers,
2322
shadow.Analyzer, // special case, used in analyzersFromConfig
2423
)
2524
for _, defaultAnalyzer := range checkList {
@@ -45,12 +44,12 @@ func (p sortedAnalyzers) Swap(i, j int) { p[i].Name, p[j].Name = p[j].Name,
4544
func TestGovetSorted(t *testing.T) {
4645
// Keeping analyzers sorted so their order match the import order.
4746
t.Run("All", func(t *testing.T) {
48-
if !sort.IsSorted(sortedAnalyzers(getAllAnalyzers())) {
47+
if !sort.IsSorted(sortedAnalyzers(allAnalyzers)) {
4948
t.Error("please keep all analyzers list sorted by name")
5049
}
5150
})
5251
t.Run("Default", func(t *testing.T) {
53-
if !sort.IsSorted(sortedAnalyzers(getDefaultAnalyzers())) {
52+
if !sort.IsSorted(sortedAnalyzers(defaultAnalyzers)) {
5453
t.Error("please keep default analyzers list sorted by name")
5554
}
5655
})

‎vendor/golang.org/x/tools/go/analysis/analysis.go

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

‎vendor/golang.org/x/tools/go/analysis/diagnostic.go

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

0 commit comments

Comments
 (0)