Skip to content

Commit a79ac2b

Browse files
smasher164ianlancetaylor
smasher164
authored and
ianlancetaylor
committed
cmd/vet: add ifaceassert and stringintconv checks
This change re-vendors x/tools to add the ifaceassert and stringintconv checks to cmd/vet. Fixes #32479. Updates #4483. Change-Id: I6bd30b0a3278592dfab4bd247036404ddaff09e4 Reviewed-on: https://go-review.googlesource.com/c/go/+/221339 Run-TryBot: Ian Lance Taylor <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> Reviewed-by: Bryan C. Mills <[email protected]>
1 parent 08dee51 commit a79ac2b

File tree

7 files changed

+240
-8
lines changed

7 files changed

+240
-8
lines changed

‎src/cmd/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ require (
88
golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6
99
golang.org/x/mod v0.2.0
1010
golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c // indirect
11-
golang.org/x/tools v0.0.0-20200219195521-7c4b6277d74d
12-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
11+
golang.org/x/tools v0.0.0-20200309180859-aa4048aca1ca
1312
)

‎src/cmd/go.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq
1313
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
1414
golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6 h1:Sy5bstxEqwwbYs6n0/pBuxKENqOeZUgD45Gp3Q3pqLg=
1515
golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
16-
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
1716
golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
1817
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
1918
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
2019
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
20+
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
2121
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
22+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
2223
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
2324
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2425
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -28,8 +29,8 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
2829
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
2930
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e h1:aZzprAO9/8oim3qStq3wc1Xuxx4QmAGriC4VU4ojemQ=
3031
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
31-
golang.org/x/tools v0.0.0-20200219195521-7c4b6277d74d h1:ZQ18He7VORO2x4IEBuwfdp56K+ftEzRjvL0cFuCGCcM=
32-
golang.org/x/tools v0.0.0-20200219195521-7c4b6277d74d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
32+
golang.org/x/tools v0.0.0-20200309180859-aa4048aca1ca h1:cFQHQhDv9N1vc+64dtXDAyd3exHDGfRTtveOnD0IsLI=
33+
golang.org/x/tools v0.0.0-20200309180859-aa4048aca1ca/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
3334
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
3435
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
3536
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎src/cmd/vendor/golang.org/x/tools/go/analysis/passes/errorsas/errorsas.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.

‎src/cmd/vendor/golang.org/x/tools/go/analysis/passes/ifaceassert/ifaceassert.go

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

‎src/cmd/vendor/golang.org/x/tools/go/analysis/passes/stringintconv/string.go

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

‎src/cmd/vendor/modules.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ golang.org/x/mod/zip
4343
## explicit
4444
golang.org/x/sys/unix
4545
golang.org/x/sys/windows
46-
# golang.org/x/tools v0.0.0-20200219195521-7c4b6277d74d
46+
# golang.org/x/tools v0.0.0-20200309180859-aa4048aca1ca
4747
## explicit
4848
golang.org/x/tools/go/analysis
4949
golang.org/x/tools/go/analysis/internal/analysisflags
@@ -59,6 +59,7 @@ golang.org/x/tools/go/analysis/passes/copylock
5959
golang.org/x/tools/go/analysis/passes/ctrlflow
6060
golang.org/x/tools/go/analysis/passes/errorsas
6161
golang.org/x/tools/go/analysis/passes/httpresponse
62+
golang.org/x/tools/go/analysis/passes/ifaceassert
6263
golang.org/x/tools/go/analysis/passes/inspect
6364
golang.org/x/tools/go/analysis/passes/internal/analysisutil
6465
golang.org/x/tools/go/analysis/passes/loopclosure
@@ -67,6 +68,7 @@ golang.org/x/tools/go/analysis/passes/nilfunc
6768
golang.org/x/tools/go/analysis/passes/printf
6869
golang.org/x/tools/go/analysis/passes/shift
6970
golang.org/x/tools/go/analysis/passes/stdmethods
71+
golang.org/x/tools/go/analysis/passes/stringintconv
7072
golang.org/x/tools/go/analysis/passes/structtag
7173
golang.org/x/tools/go/analysis/passes/tests
7274
golang.org/x/tools/go/analysis/passes/unmarshal
@@ -80,6 +82,5 @@ golang.org/x/tools/go/cfg
8082
golang.org/x/tools/go/types/objectpath
8183
golang.org/x/tools/go/types/typeutil
8284
# golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
83-
## explicit
8485
golang.org/x/xerrors
8586
golang.org/x/xerrors/internal

‎src/cmd/vet/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ import (
1515
"golang.org/x/tools/go/analysis/passes/copylock"
1616
"golang.org/x/tools/go/analysis/passes/errorsas"
1717
"golang.org/x/tools/go/analysis/passes/httpresponse"
18+
"golang.org/x/tools/go/analysis/passes/ifaceassert"
1819
"golang.org/x/tools/go/analysis/passes/loopclosure"
1920
"golang.org/x/tools/go/analysis/passes/lostcancel"
2021
"golang.org/x/tools/go/analysis/passes/nilfunc"
2122
"golang.org/x/tools/go/analysis/passes/printf"
2223
"golang.org/x/tools/go/analysis/passes/shift"
2324
"golang.org/x/tools/go/analysis/passes/stdmethods"
25+
"golang.org/x/tools/go/analysis/passes/stringintconv"
2426
"golang.org/x/tools/go/analysis/passes/structtag"
2527
"golang.org/x/tools/go/analysis/passes/tests"
2628
"golang.org/x/tools/go/analysis/passes/unmarshal"
@@ -43,12 +45,14 @@ func main() {
4345
copylock.Analyzer,
4446
errorsas.Analyzer,
4547
httpresponse.Analyzer,
48+
ifaceassert.Analyzer,
4649
loopclosure.Analyzer,
4750
lostcancel.Analyzer,
4851
nilfunc.Analyzer,
4952
printf.Analyzer,
5053
shift.Analyzer,
5154
stdmethods.Analyzer,
55+
stringintconv.Analyzer,
5256
structtag.Analyzer,
5357
tests.Analyzer,
5458
unmarshal.Analyzer,

0 commit comments

Comments
 (0)