From: Robert Griesemer <gri@golang.org>
Date: Thu, 4 Jun 2015 23:09:15 +0000 (-0700)
Subject: cmd/go: use new vet location
X-Git-Tag: go1.5beta1~331
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a544a3a6f792dc57c8854b08a9a54cebe9e8a93f;p=gostls13.git

cmd/go: use new vet location

Change-Id: I7d96ebcca5954152edb821bb41b6047a1c622949
Reviewed-on: https://go-review.googlesource.com/10731
Reviewed-by: Andrew Gerrand <adg@golang.org>
Reviewed-by: Rob Pike <r@golang.org>
---

diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
index bc099a8d31..539ef5bfc6 100644
--- a/src/cmd/go/pkg.go
+++ b/src/cmd/go/pkg.go
@@ -411,9 +411,9 @@ var goTools = map[string]targetDir{
 	"cmd/pack":                             toTool,
 	"cmd/pprof":                            toTool,
 	"cmd/trace":                            toTool,
+	"cmd/vet":                              toTool,
 	"cmd/yacc":                             toTool,
 	"golang.org/x/tools/cmd/godoc":         toBin,
-	"golang.org/x/tools/cmd/vet":           toTool,
 	"code.google.com/p/go.tools/cmd/cover": stalePath,
 	"code.google.com/p/go.tools/cmd/godoc": stalePath,
 	"code.google.com/p/go.tools/cmd/vet":   stalePath,
diff --git a/src/cmd/go/tool.go b/src/cmd/go/tool.go
index bf8ff03bc3..937ca1f306 100644
--- a/src/cmd/go/tool.go
+++ b/src/cmd/go/tool.go
@@ -67,10 +67,6 @@ func tool(toolName string) string {
 }
 
 func isInGoToolsRepo(toolName string) bool {
-	switch toolName {
-	case "vet":
-		return true
-	}
 	return false
 }
 
diff --git a/src/cmd/go/vet.go b/src/cmd/go/vet.go
index 902edbbe73..81b978e8da 100644
--- a/src/cmd/go/vet.go
+++ b/src/cmd/go/vet.go
@@ -17,7 +17,7 @@ var cmdVet = &Command{
 	Long: `
 Vet runs the Go vet command on the packages named by the import paths.
 
-For more about vet, see 'godoc golang.org/x/tools/cmd/vet'.
+For more about vet, see 'go doc cmd/vet'.
 For more about specifying packages, see 'go help packages'.
 
 To run the vet tool with specific options, run 'go tool vet'.