cmd/api: use golang.org/x/... import paths

LGTM=bradfitz, rsc
R=rsc, bradfitz
CC=golang-codereviews
https://golang.org/cl/169000043

diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go
index 5a8c87603395fec73e5823044585998a39447ebf..49e592d0c29d2135358ff632baca0067ca58d3b0 100644 (file)
--- a/src/cmd/api/goapi.go
+++ b/src/cmd/api/goapi.go
@@ -27,7 +27,7 @@ import (
        "sort"
        "strings"
 
-       "code.google.com/p/go.tools/go/types"
+       "golang.org/x/tools/go/types"
 )
 
 // Flags

diff --git a/src/cmd/api/run.go b/src/cmd/api/run.go
index c323deb6031540a3ff800f9038bb5078ac064a00..52b23de454a5a976dfd1f3309fe5e8efa240599e 100644 (file)
--- a/src/cmd/api/run.go
+++ b/src/cmd/api/run.go
@@ -91,7 +91,7 @@ func file(s ...string) string {
 // It tries to re-use a go.tools checkout from a previous run if possible,
 // else it hg clones it.
 func prepGoPath() string {
-       const tempBase = "go.tools.TMP"
+       const tempBase = "tools.TMP"
 
        username := ""
        u, err := user.Current()
@@ -108,14 +108,14 @@ func prepGoPath() string {
        gopath := filepath.Join(os.TempDir(), "gopath-api-"+cleanUsername(username), goToolsVersion)
 
        // cloneDir is where we run "hg clone".
-       cloneDir := filepath.Join(gopath, "src", "code.google.com", "p")
+       cloneDir := filepath.Join(gopath, "src", "golang.org", "x")
 
        // The dir we clone into. We only atomically rename it to finalDir on
        // clone success.
        tmpDir := filepath.Join(cloneDir, tempBase)
 
        // finalDir is where the checkout will live once it's complete.
-       finalDir := filepath.Join(cloneDir, "go.tools")
+       finalDir := filepath.Join(cloneDir, "tools")
 
        if goToolsCheckoutGood(finalDir) {
                return gopath