From 16a24dc92b3f456d839ba5f90861e3fa3243efc7 Mon Sep 17 00:00:00 2001 From: golangci Date: Sun, 6 May 2018 09:52:42 +0300 Subject: [PATCH] fix govet: don't recurse into dirs --- Gopkg.lock | 23 +++++++++---------- Gopkg.toml | 3 +-- pkg/golinters/govet.go | 2 +- .../{golang/go => golangci/govet}/LICENSE | 0 .../{golang/go => golangci/govet}/README | 0 .../{golang/go => golangci/govet}/asmdecl.go | 0 .../{golang/go => golangci/govet}/assign.go | 0 .../{golang/go => golangci/govet}/atomic.go | 0 .../{golang/go => golangci/govet}/bool.go | 0 .../{golang/go => golangci/govet}/buildtag.go | 0 .../{golang/go => golangci/govet}/cgo.go | 0 .../go => golangci/govet}/composite.go | 2 +- .../{golang/go => golangci/govet}/copylock.go | 0 .../{golang/go => golangci/govet}/dead.go | 0 .../{golang/go => golangci/govet}/deadcode.go | 0 .../{golang/go => golangci/govet}/doc.go | 0 .../{golang/go => golangci/govet}/golangci.go | 2 +- .../go => golangci/govet}/httpresponse.go | 0 .../go => golangci/govet}/lib/cfg/builder.go | 0 .../go => golangci/govet}/lib/cfg/cfg.go | 0 .../govet}/lib/whitelist/whitelist.go | 0 .../go => golangci/govet}/lostcancel.go | 2 +- .../{golang/go => golangci/govet}/main.go | 0 .../{golang/go => golangci/govet}/method.go | 0 .../{golang/go => golangci/govet}/nilfunc.go | 0 .../{golang/go => golangci/govet}/print.go | 0 .../go => golangci/govet}/rangeloop.go | 0 .../{golang/go => golangci/govet}/shadow.go | 0 .../{golang/go => golangci/govet}/shift.go | 0 .../go => golangci/govet}/structtag.go | 0 .../{golang/go => golangci/govet}/tests.go | 0 .../{golang/go => golangci/govet}/types.go | 0 .../go => golangci/govet}/unsafeptr.go | 0 .../{golang/go => golangci/govet}/unused.go | 0 34 files changed, 16 insertions(+), 18 deletions(-) rename vendor/github.com/{golang/go => golangci/govet}/LICENSE (100%) rename vendor/github.com/{golang/go => golangci/govet}/README (100%) rename vendor/github.com/{golang/go => golangci/govet}/asmdecl.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/assign.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/atomic.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/bool.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/buildtag.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/cgo.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/composite.go (97%) rename vendor/github.com/{golang/go => golangci/govet}/copylock.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/dead.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/deadcode.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/doc.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/golangci.go (97%) rename vendor/github.com/{golang/go => golangci/govet}/httpresponse.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/lib/cfg/builder.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/lib/cfg/cfg.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/lib/whitelist/whitelist.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/lostcancel.go (99%) rename vendor/github.com/{golang/go => golangci/govet}/main.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/method.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/nilfunc.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/print.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/rangeloop.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/shadow.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/shift.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/structtag.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/tests.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/types.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/unsafeptr.go (100%) rename vendor/github.com/{golang/go => golangci/govet}/unused.go (100%) diff --git a/Gopkg.lock b/Gopkg.lock index f1d1dcae..ac541ddc 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -46,17 +46,6 @@ revision = "1adfc126b41513cc696b209667c8656ea7aac67c" version = "v1.0.0" -[[projects]] - branch = "master" - name = "github.com/golang/go" - packages = [ - ".", - "lib/cfg", - "lib/whitelist" - ] - revision = "c5b798e3c473354ef919e8fe4e0a11b4a9e36d18" - source = "github.com/golangci/govet" - [[projects]] branch = "master" name = "github.com/golang/lint" @@ -89,6 +78,16 @@ ] revision = "841f39765a89eddef59ce611612775291b83594b" +[[projects]] + branch = "master" + name = "github.com/golangci/govet" + packages = [ + ".", + "lib/cfg", + "lib/whitelist" + ] + revision = "31bebf17d90d40b728c41fecdd5acf5fb8654fc7" + [[projects]] name = "github.com/inconshreveable/mousetrap" packages = ["."] @@ -232,6 +231,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "98e0ff9e850bf286e0e15b788f303a6baffcccb7c4d9a55155f28eee386cb43b" + inputs-digest = "c4187e819ccca1b06537adb888a052a895c6236f90accd827314c12b2fd1ce3e" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index ca9402c8..5576086e 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -51,9 +51,8 @@ source = "github.com/golangci/errcheck" [[constraint]] - name = "github.com/golang/go" + name = "github.com/golangci/govet" branch = "master" - source = "github.com/golangci/govet" [prune] go-tests = true diff --git a/pkg/golinters/govet.go b/pkg/golinters/govet.go index a70fae08..3f75a668 100644 --- a/pkg/golinters/govet.go +++ b/pkg/golinters/govet.go @@ -3,10 +3,10 @@ package golinters import ( "context" - govetAPI "github.com/golang/go" "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-shared/pkg/executors" + govetAPI "github.com/golangci/govet" ) type govet struct{} diff --git a/vendor/github.com/golang/go/LICENSE b/vendor/github.com/golangci/govet/LICENSE similarity index 100% rename from vendor/github.com/golang/go/LICENSE rename to vendor/github.com/golangci/govet/LICENSE diff --git a/vendor/github.com/golang/go/README b/vendor/github.com/golangci/govet/README similarity index 100% rename from vendor/github.com/golang/go/README rename to vendor/github.com/golangci/govet/README diff --git a/vendor/github.com/golang/go/asmdecl.go b/vendor/github.com/golangci/govet/asmdecl.go similarity index 100% rename from vendor/github.com/golang/go/asmdecl.go rename to vendor/github.com/golangci/govet/asmdecl.go diff --git a/vendor/github.com/golang/go/assign.go b/vendor/github.com/golangci/govet/assign.go similarity index 100% rename from vendor/github.com/golang/go/assign.go rename to vendor/github.com/golangci/govet/assign.go diff --git a/vendor/github.com/golang/go/atomic.go b/vendor/github.com/golangci/govet/atomic.go similarity index 100% rename from vendor/github.com/golang/go/atomic.go rename to vendor/github.com/golangci/govet/atomic.go diff --git a/vendor/github.com/golang/go/bool.go b/vendor/github.com/golangci/govet/bool.go similarity index 100% rename from vendor/github.com/golang/go/bool.go rename to vendor/github.com/golangci/govet/bool.go diff --git a/vendor/github.com/golang/go/buildtag.go b/vendor/github.com/golangci/govet/buildtag.go similarity index 100% rename from vendor/github.com/golang/go/buildtag.go rename to vendor/github.com/golangci/govet/buildtag.go diff --git a/vendor/github.com/golang/go/cgo.go b/vendor/github.com/golangci/govet/cgo.go similarity index 100% rename from vendor/github.com/golang/go/cgo.go rename to vendor/github.com/golangci/govet/cgo.go diff --git a/vendor/github.com/golang/go/composite.go b/vendor/github.com/golangci/govet/composite.go similarity index 97% rename from vendor/github.com/golang/go/composite.go rename to vendor/github.com/golangci/govet/composite.go index 4651b0f1..2e871022 100644 --- a/vendor/github.com/golang/go/composite.go +++ b/vendor/github.com/golangci/govet/composite.go @@ -12,7 +12,7 @@ import ( "go/types" "strings" - "github.com/golang/go/lib/whitelist" + "github.com/golangci/govet/lib/whitelist" ) var compositeWhiteList = flag.Bool("compositewhitelist", true, "use composite white list; for testing only") diff --git a/vendor/github.com/golang/go/copylock.go b/vendor/github.com/golangci/govet/copylock.go similarity index 100% rename from vendor/github.com/golang/go/copylock.go rename to vendor/github.com/golangci/govet/copylock.go diff --git a/vendor/github.com/golang/go/dead.go b/vendor/github.com/golangci/govet/dead.go similarity index 100% rename from vendor/github.com/golang/go/dead.go rename to vendor/github.com/golangci/govet/dead.go diff --git a/vendor/github.com/golang/go/deadcode.go b/vendor/github.com/golangci/govet/deadcode.go similarity index 100% rename from vendor/github.com/golang/go/deadcode.go rename to vendor/github.com/golangci/govet/deadcode.go diff --git a/vendor/github.com/golang/go/doc.go b/vendor/github.com/golangci/govet/doc.go similarity index 100% rename from vendor/github.com/golang/go/doc.go rename to vendor/github.com/golangci/govet/doc.go diff --git a/vendor/github.com/golang/go/golangci.go b/vendor/github.com/golangci/govet/golangci.go similarity index 97% rename from vendor/github.com/golang/go/golangci.go rename to vendor/github.com/golangci/govet/golangci.go index cc54fb39..94ef1c1b 100644 --- a/vendor/github.com/golang/go/golangci.go +++ b/vendor/github.com/golangci/govet/golangci.go @@ -52,7 +52,7 @@ func Run(paths, buildTags []string, checkShadowing bool) ([]Issue, error) { } if dirsRun { for _, name := range paths { - walkDir(name) + doPackageDir(name) } return foundIssues, nil } diff --git a/vendor/github.com/golang/go/httpresponse.go b/vendor/github.com/golangci/govet/httpresponse.go similarity index 100% rename from vendor/github.com/golang/go/httpresponse.go rename to vendor/github.com/golangci/govet/httpresponse.go diff --git a/vendor/github.com/golang/go/lib/cfg/builder.go b/vendor/github.com/golangci/govet/lib/cfg/builder.go similarity index 100% rename from vendor/github.com/golang/go/lib/cfg/builder.go rename to vendor/github.com/golangci/govet/lib/cfg/builder.go diff --git a/vendor/github.com/golang/go/lib/cfg/cfg.go b/vendor/github.com/golangci/govet/lib/cfg/cfg.go similarity index 100% rename from vendor/github.com/golang/go/lib/cfg/cfg.go rename to vendor/github.com/golangci/govet/lib/cfg/cfg.go diff --git a/vendor/github.com/golang/go/lib/whitelist/whitelist.go b/vendor/github.com/golangci/govet/lib/whitelist/whitelist.go similarity index 100% rename from vendor/github.com/golang/go/lib/whitelist/whitelist.go rename to vendor/github.com/golangci/govet/lib/whitelist/whitelist.go diff --git a/vendor/github.com/golang/go/lostcancel.go b/vendor/github.com/golangci/govet/lostcancel.go similarity index 99% rename from vendor/github.com/golang/go/lostcancel.go rename to vendor/github.com/golangci/govet/lostcancel.go index 2d3a07de..387b77b5 100644 --- a/vendor/github.com/golang/go/lostcancel.go +++ b/vendor/github.com/golangci/govet/lostcancel.go @@ -10,7 +10,7 @@ import ( "go/types" "strconv" - "github.com/golang/go/lib/cfg" + "github.com/golangci/govet/lib/cfg" ) func init() { diff --git a/vendor/github.com/golang/go/main.go b/vendor/github.com/golangci/govet/main.go similarity index 100% rename from vendor/github.com/golang/go/main.go rename to vendor/github.com/golangci/govet/main.go diff --git a/vendor/github.com/golang/go/method.go b/vendor/github.com/golangci/govet/method.go similarity index 100% rename from vendor/github.com/golang/go/method.go rename to vendor/github.com/golangci/govet/method.go diff --git a/vendor/github.com/golang/go/nilfunc.go b/vendor/github.com/golangci/govet/nilfunc.go similarity index 100% rename from vendor/github.com/golang/go/nilfunc.go rename to vendor/github.com/golangci/govet/nilfunc.go diff --git a/vendor/github.com/golang/go/print.go b/vendor/github.com/golangci/govet/print.go similarity index 100% rename from vendor/github.com/golang/go/print.go rename to vendor/github.com/golangci/govet/print.go diff --git a/vendor/github.com/golang/go/rangeloop.go b/vendor/github.com/golangci/govet/rangeloop.go similarity index 100% rename from vendor/github.com/golang/go/rangeloop.go rename to vendor/github.com/golangci/govet/rangeloop.go diff --git a/vendor/github.com/golang/go/shadow.go b/vendor/github.com/golangci/govet/shadow.go similarity index 100% rename from vendor/github.com/golang/go/shadow.go rename to vendor/github.com/golangci/govet/shadow.go diff --git a/vendor/github.com/golang/go/shift.go b/vendor/github.com/golangci/govet/shift.go similarity index 100% rename from vendor/github.com/golang/go/shift.go rename to vendor/github.com/golangci/govet/shift.go diff --git a/vendor/github.com/golang/go/structtag.go b/vendor/github.com/golangci/govet/structtag.go similarity index 100% rename from vendor/github.com/golang/go/structtag.go rename to vendor/github.com/golangci/govet/structtag.go diff --git a/vendor/github.com/golang/go/tests.go b/vendor/github.com/golangci/govet/tests.go similarity index 100% rename from vendor/github.com/golang/go/tests.go rename to vendor/github.com/golangci/govet/tests.go diff --git a/vendor/github.com/golang/go/types.go b/vendor/github.com/golangci/govet/types.go similarity index 100% rename from vendor/github.com/golang/go/types.go rename to vendor/github.com/golangci/govet/types.go diff --git a/vendor/github.com/golang/go/unsafeptr.go b/vendor/github.com/golangci/govet/unsafeptr.go similarity index 100% rename from vendor/github.com/golang/go/unsafeptr.go rename to vendor/github.com/golangci/govet/unsafeptr.go diff --git a/vendor/github.com/golang/go/unused.go b/vendor/github.com/golangci/govet/unused.go similarity index 100% rename from vendor/github.com/golang/go/unused.go rename to vendor/github.com/golangci/govet/unused.go