From 5ebbcd132f1e9c320204496eeeaac47007339543 Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Mon, 10 Nov 2014 08:50:40 +1100 Subject: [PATCH] go.tools: use golang.org/x/... import paths Rewrite performed with this command: sed -i '' 's_code.google.com/p/go\._golang.org/x/_g' \ $(grep -lr 'code.google.com/p/go.' *) LGTM=rsc R=rsc CC=golang-codereviews https://golang.org/cl/170920043 --- astutil/enclosing_test.go | 2 +- blog/blog.go | 4 ++-- cmd/cover/func.go | 2 +- cmd/cover/html.go | 2 +- cmd/digraph/digraph.go | 2 +- cmd/eg/eg.go | 4 ++-- cmd/godex/doc.go | 2 +- cmd/godex/gc.go | 2 +- cmd/godex/gccgo.go | 4 ++-- cmd/godex/godex.go | 2 +- cmd/godex/print.go | 4 ++-- cmd/godex/source.go | 2 +- cmd/godex/writetype.go | 2 +- cmd/godoc/README.godoc-app | 4 ++-- cmd/godoc/appinit.go | 10 +++++----- cmd/godoc/blog.go | 6 +++--- cmd/godoc/codewalk.go | 4 ++-- cmd/godoc/handlers.go | 6 +++--- cmd/godoc/main.go | 16 ++++++++-------- cmd/godoc/play.go | 2 +- cmd/godoc/setup-godoc-app.bash | 2 +- cmd/goimports/doc.go | 2 +- cmd/goimports/goimports.go | 2 +- cmd/gorename/main.go | 2 +- cmd/gotype/gotype.go | 6 +++--- cmd/html2article/conv.go | 6 +++--- cmd/oracle/emacs-test.bash | 4 ++-- cmd/oracle/main.go | 8 ++++---- cmd/oracle/oracle.el | 2 +- cmd/present/appengine.go | 4 ++-- cmd/present/dir.go | 2 +- cmd/present/doc.go | 4 ++-- cmd/present/local.go | 6 +++--- cmd/present/play.go | 2 +- cmd/ssadump/main.go | 8 ++++---- cmd/stringer/stringer.go | 8 ++++---- cmd/vet/composite.go | 2 +- cmd/vet/copylock.go | 2 +- cmd/vet/main.go | 6 +++--- cmd/vet/nilfunc.go | 2 +- cmd/vet/print.go | 4 ++-- cmd/vet/shadow.go | 2 +- cmd/vet/shift.go | 4 ++-- cmd/vet/types.go | 2 +- cmd/vet/unsafeptr.go | 2 +- container/intsets/sparse_test.go | 2 +- dashboard/app/build/dash.go | 18 +++++++++--------- dashboard/app/build/test.go | 2 +- dashboard/builder/env.go | 2 +- dashboard/builder/main.go | 4 ++-- dashboard/builder/vcs.go | 2 +- .../linux-x86-base/scripts/build-go-builder.sh | 4 ++-- .../scripts/build-go-builder.sh | 4 ++-- .../linux-x86-nacl/scripts/build-go-builder.sh | 4 ++-- .../linux-x86-sid/scripts/build-go-builder.sh | 4 ++-- dashboard/watcher/watcher.go | 2 +- go/buildutil/allpackages_test.go | 4 ++-- go/buildutil/util_test.go | 6 +++--- go/callgraph/callgraph.go | 2 +- go/callgraph/util.go | 2 +- go/gccgoimporter/gccgoinstallation.go | 2 +- go/gccgoimporter/gccgoinstallation_test.go | 2 +- go/gccgoimporter/importer.go | 4 ++-- go/gccgoimporter/importer_test.go | 2 +- go/gccgoimporter/parser.go | 4 ++-- go/gccgoimporter/parser_test.go | 2 +- go/gcimporter/gcimporter.go | 4 ++-- go/gcimporter/gcimporter_test.go | 2 +- go/importer/export.go | 4 ++-- go/importer/import.go | 4 ++-- go/importer/import_test.go | 4 ++-- go/importer/predefined.go | 2 +- go/loader/loader.go | 6 +++--- go/loader/loader_test.go | 2 +- go/loader/source_test.go | 6 +++--- go/loader/stdlib_test.go | 6 +++--- go/pointer/analysis.go | 8 ++++---- go/pointer/api.go | 8 ++++---- go/pointer/callgraph.go | 2 +- go/pointer/constraint.go | 2 +- go/pointer/example_test.go | 8 ++++---- go/pointer/gen.go | 6 +++--- go/pointer/hvn.go | 4 ++-- go/pointer/intrinsics.go | 4 ++-- go/pointer/labels.go | 4 ++-- go/pointer/pointer_test.go | 14 +++++++------- go/pointer/reflect.go | 6 +++--- go/pointer/solve.go | 2 +- go/pointer/stdlib_test.go | 10 +++++----- go/pointer/util.go | 4 ++-- go/ssa/builder.go | 4 ++-- go/ssa/builder_test.go | 6 +++--- go/ssa/const.go | 4 ++-- go/ssa/create.go | 4 ++-- go/ssa/emit.go | 2 +- go/ssa/example_test.go | 6 +++--- go/ssa/func.go | 2 +- go/ssa/interp/external.go | 4 ++-- go/ssa/interp/interp.go | 4 ++-- go/ssa/interp/interp_test.go | 12 ++++++------ go/ssa/interp/map.go | 2 +- go/ssa/interp/ops.go | 6 +++--- go/ssa/interp/reflect.go | 4 ++-- go/ssa/interp/value.go | 6 +++--- go/ssa/lift.go | 2 +- go/ssa/lvalue.go | 2 +- go/ssa/methods.go | 2 +- go/ssa/print.go | 4 ++-- go/ssa/sanity.go | 2 +- go/ssa/source.go | 2 +- go/ssa/source_test.go | 10 +++++----- go/ssa/ssa.go | 8 ++++---- go/ssa/ssautil/switch.go | 4 ++-- go/ssa/ssautil/switch_test.go | 6 +++--- go/ssa/ssautil/visit.go | 2 +- go/ssa/stdlib_test.go | 8 ++++---- go/ssa/testmain.go | 2 +- go/ssa/testmain_test.go | 4 ++-- go/ssa/util.go | 2 +- go/ssa/wrappers.go | 2 +- go/types/api.go | 4 ++-- go/types/api_test.go | 4 ++-- go/types/builtins.go | 2 +- go/types/builtins_test.go | 4 ++-- go/types/check.go | 2 +- go/types/check_test.go | 4 ++-- go/types/conversions.go | 2 +- go/types/decl.go | 2 +- go/types/eval.go | 2 +- go/types/eval_test.go | 4 ++-- go/types/expr.go | 2 +- go/types/exprstring_test.go | 2 +- go/types/hilbert_test.go | 2 +- go/types/issues_test.go | 4 ++-- go/types/object.go | 2 +- go/types/operand.go | 2 +- go/types/resolver.go | 4 ++-- go/types/resolver_test.go | 4 ++-- go/types/self_test.go | 4 ++-- go/types/stdlib_test.go | 4 ++-- go/types/stmt.go | 2 +- go/types/typestring_test.go | 4 ++-- go/types/typeutil/imports.go | 2 +- go/types/typeutil/imports_test.go | 4 ++-- go/types/typeutil/map.go | 2 +- go/types/typeutil/map_test.go | 4 ++-- go/types/typeutil/ui.go | 2 +- go/types/typexpr.go | 2 +- go/types/universe.go | 2 +- godoc/analysis/analysis.go | 12 ++++++------ godoc/analysis/callgraph.go | 6 +++--- godoc/analysis/implements.go | 2 +- godoc/analysis/peers.go | 6 +++--- godoc/analysis/typeinfo.go | 6 +++--- godoc/cmdline.go | 4 ++-- godoc/cmdline_test.go | 4 ++-- godoc/corpus.go | 6 +++--- godoc/index.go | 4 ++-- godoc/index_test.go | 2 +- godoc/meta.go | 2 +- godoc/parser.go | 2 +- godoc/pres.go | 2 +- godoc/redirect/redirect.go | 4 ++-- godoc/server.go | 6 +++--- godoc/static/doc.go | 2 +- godoc/static/package.html | 14 +++++++------- godoc/static/static.go | 14 +++++++------- godoc/template.go | 2 +- godoc/util/util.go | 2 +- godoc/vfs/gatefs/gatefs.go | 2 +- godoc/vfs/httpfs/httpfs.go | 2 +- godoc/vfs/mapfs/mapfs.go | 2 +- godoc/vfs/zipfs/zipfs.go | 2 +- imports/fix.go | 2 +- imports/imports.go | 2 +- oracle/callees.go | 6 +++--- oracle/callers.go | 6 +++--- oracle/callgraph.go | 8 ++++---- oracle/callstack.go | 6 +++--- oracle/definition.go | 4 ++-- oracle/describe.go | 12 ++++++------ oracle/freevars.go | 4 ++-- oracle/implements.go | 4 ++-- oracle/oracle.go | 14 +++++++------- oracle/oracle_test.go | 6 +++--- oracle/peers.go | 8 ++++---- oracle/pointsto.go | 12 ++++++------ oracle/pos.go | 2 +- oracle/referrers.go | 4 ++-- oracle/what.go | 4 ++-- playground/socket/socket.go | 2 +- refactor/README | 2 +- refactor/eg/eg.go | 6 +++--- refactor/eg/eg_test.go | 8 ++++---- refactor/eg/match.go | 6 +++--- refactor/eg/rewrite.go | 4 ++-- refactor/importgraph/graph.go | 2 +- refactor/importgraph/graph_test.go | 4 ++-- refactor/lexical/lexical.go | 4 ++-- refactor/lexical/lexical_test.go | 8 ++++---- refactor/rename/check.go | 10 +++++----- refactor/rename/rename.el | 4 ++-- refactor/rename/rename.go | 10 +++++----- refactor/rename/spec.go | 6 +++--- refactor/rename/util.go | 4 ++-- refactor/satisfy/find.go | 6 +++--- 206 files changed, 444 insertions(+), 444 deletions(-) diff --git a/astutil/enclosing_test.go b/astutil/enclosing_test.go index 18b911d9..ace6974a 100644 --- a/astutil/enclosing_test.go +++ b/astutil/enclosing_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "code.google.com/p/go.tools/astutil" + "golang.org/x/tools/astutil" ) // pathToString returns a string containing the concrete types of the diff --git a/blog/blog.go b/blog/blog.go index 148bbefc..b53cf5bd 100644 --- a/blog/blog.go +++ b/blog/blog.go @@ -20,8 +20,8 @@ import ( "strings" "time" - "code.google.com/p/go.tools/blog/atom" - "code.google.com/p/go.tools/present" + "golang.org/x/tools/blog/atom" + "golang.org/x/tools/present" ) var validJSONPFunc = regexp.MustCompile(`(?i)^[a-z_][a-z0-9_.]*$`) diff --git a/cmd/cover/func.go b/cmd/cover/func.go index 2ec57cfb..41d9fcec 100644 --- a/cmd/cover/func.go +++ b/cmd/cover/func.go @@ -17,7 +17,7 @@ import ( "path/filepath" "text/tabwriter" - "code.google.com/p/go.tools/cover" + "golang.org/x/tools/cover" ) // funcOutput takes two file names as arguments, a coverage profile to read as input and an output diff --git a/cmd/cover/html.go b/cmd/cover/html.go index e132cf21..f6b22640 100644 --- a/cmd/cover/html.go +++ b/cmd/cover/html.go @@ -17,7 +17,7 @@ import ( "path/filepath" "runtime" - "code.google.com/p/go.tools/cover" + "golang.org/x/tools/cover" ) // htmlOutput reads the profile data from profile and generates an HTML diff --git a/cmd/digraph/digraph.go b/cmd/digraph/digraph.go index 0d3868c4..a5c623b5 100644 --- a/cmd/digraph/digraph.go +++ b/cmd/digraph/digraph.go @@ -74,7 +74,7 @@ Example usage: Show the transitive closure of imports of the digraph tool itself: % go list -f '{{.ImportPath}}{{.Imports}}' ... | tr '[]' ' ' | - digraph forward code.google.com/p/go.tools/cmd/digraph + digraph forward golang.org/x/tools/cmd/digraph Show which clothes (see above) must be donned before a jacket: % digraph reverse jacket $log 2>&1 || true # (prints usage and exits 1) grep -q "Run.*help" $log || die "$GOROOT/bin/oracle not installed" @@ -34,7 +34,7 @@ emacs --batch --no-splash --no-window-system --no-init \ --load $thisdir/oracle.el \ --eval ' (progn - (setq go-oracle-scope "code.google.com/p/go.tools/cmd/oracle") + (setq go-oracle-scope "golang.org/x/tools/cmd/oracle") (find-file "'$thisdir'/main.go") (search-forward "\"fmt\"") (backward-char) diff --git a/cmd/oracle/main.go b/cmd/oracle/main.go index 580fd6c8..cdf5329c 100644 --- a/cmd/oracle/main.go +++ b/cmd/oracle/main.go @@ -23,8 +23,8 @@ import ( "runtime" "runtime/pprof" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/oracle" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/oracle" ) var posFlag = flag.String("pos", "", @@ -69,8 +69,8 @@ The user manual is available here: http://golang.org/s/oracle-user-manual Examples: Describe the syntax at offset 530 in this file (an import spec): -% oracle -pos=src/code.google.com/p/go.tools/cmd/oracle/main.go:#530 describe \ - code.google.com/p/go.tools/cmd/oracle +% oracle -pos=src/golang.org/x/tools/cmd/oracle/main.go:#530 describe \ + golang.org/x/tools/cmd/oracle Print the callgraph of the trivial web-server in JSON format: % oracle -format=json $GOROOT/src/net/http/triv.go callgraph diff --git a/cmd/oracle/oracle.el b/cmd/oracle/oracle.el index dacf9da1..35cd8922 100644 --- a/cmd/oracle/oracle.el +++ b/cmd/oracle/oracle.el @@ -3,7 +3,7 @@ ;;; ;;; To install the Go oracle, run: ;;; % export GOROOT=... GOPATH=... -;;; % go get code.google.com/p/go.tools/cmd/oracle +;;; % go get golang.org/x/tools/cmd/oracle ;;; % mv $GOPATH/bin/oracle $GOROOT/bin/ ;;; ;;; Load this file into Emacs and set go-oracle-scope to your diff --git a/cmd/present/appengine.go b/cmd/present/appengine.go index b7d8574e..7df536c1 100644 --- a/cmd/present/appengine.go +++ b/cmd/present/appengine.go @@ -9,9 +9,9 @@ package main import ( "mime" - "code.google.com/p/go.tools/present" + "golang.org/x/tools/present" - _ "code.google.com/p/go.tools/playground" + _ "golang.org/x/tools/playground" ) var basePath = "./present/" diff --git a/cmd/present/dir.go b/cmd/present/dir.go index dd3e0810..26392dcb 100644 --- a/cmd/present/dir.go +++ b/cmd/present/dir.go @@ -13,7 +13,7 @@ import ( "path/filepath" "sort" - "code.google.com/p/go.tools/present" + "golang.org/x/tools/present" ) func init() { diff --git a/cmd/present/doc.go b/cmd/present/doc.go index 39f6d41d..1b81c311 100644 --- a/cmd/present/doc.go +++ b/cmd/present/doc.go @@ -8,7 +8,7 @@ presents slide and article files from the current directory. It may be run as a stand-alone command or an App Engine app. Instructions for deployment to App Engine are in the README of the -code.google.com/p/go.tools repository. +golang.org/x/tools repository. Usage of present: -base="": base path for slide template and static resources @@ -26,6 +26,6 @@ the generated output. The supported formats are: .article // article format, such as a blog post The present file format is documented by the present package: -http://godoc.org/code.google.com/p/go.tools/present +http://godoc.org/golang.org/x/tools/present */ package main diff --git a/cmd/present/local.go b/cmd/present/local.go index 294a5247..d91dcc2a 100644 --- a/cmd/present/local.go +++ b/cmd/present/local.go @@ -18,11 +18,11 @@ import ( "runtime" "strings" - "code.google.com/p/go.tools/playground/socket" - "code.google.com/p/go.tools/present" + "golang.org/x/tools/playground/socket" + "golang.org/x/tools/present" ) -const basePkg = "code.google.com/p/go.tools/cmd/present" +const basePkg = "golang.org/x/tools/cmd/present" var basePath string diff --git a/cmd/present/play.go b/cmd/present/play.go index 617d2c16..831b99f4 100644 --- a/cmd/present/play.go +++ b/cmd/present/play.go @@ -12,7 +12,7 @@ import ( "path/filepath" "time" - "code.google.com/p/go.tools/godoc/static" + "golang.org/x/tools/godoc/static" ) var scripts = []string{"jquery.js", "jquery-ui.js", "playground.js", "play.js"} diff --git a/cmd/ssadump/main.go b/cmd/ssadump/main.go index f955783b..f0636596 100644 --- a/cmd/ssadump/main.go +++ b/cmd/ssadump/main.go @@ -13,10 +13,10 @@ import ( "runtime" "runtime/pprof" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/ssa/interp" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/ssa/interp" + "golang.org/x/tools/go/types" ) var buildFlag = flag.String("build", "", `Options controlling the SSA builder. diff --git a/cmd/stringer/stringer.go b/cmd/stringer/stringer.go index bc3af184..33343def 100644 --- a/cmd/stringer/stringer.go +++ b/cmd/stringer/stringer.go @@ -74,10 +74,10 @@ import ( "sort" "strings" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/types" - _ "code.google.com/p/go.tools/go/gcimporter" + _ "golang.org/x/tools/go/gcimporter" ) var ( @@ -91,7 +91,7 @@ func Usage() { fmt.Fprintf(os.Stderr, "\tstringer [flags] -type T [directory]\n") fmt.Fprintf(os.Stderr, "\tstringer [flags[ -type T files... # Must be a single package\n") fmt.Fprintf(os.Stderr, "For more information, see:\n") - fmt.Fprintf(os.Stderr, "\thttp://godoc.org/code.google.com/p/go.tools/cmd/stringer\n") + fmt.Fprintf(os.Stderr, "\thttp://godoc.org/golang.org/x/tools/cmd/stringer\n") fmt.Fprintf(os.Stderr, "Flags:\n") flag.PrintDefaults() os.Exit(2) diff --git a/cmd/vet/composite.go b/cmd/vet/composite.go index 408fb377..0c3f9165 100644 --- a/cmd/vet/composite.go +++ b/cmd/vet/composite.go @@ -11,7 +11,7 @@ import ( "go/ast" "strings" - "code.google.com/p/go.tools/cmd/vet/whitelist" + "golang.org/x/tools/cmd/vet/whitelist" ) var compositeWhiteList = flag.Bool("compositewhitelist", true, "use composite white list; for testing only") diff --git a/cmd/vet/copylock.go b/cmd/vet/copylock.go index 48b7e96b..e8a6820f 100644 --- a/cmd/vet/copylock.go +++ b/cmd/vet/copylock.go @@ -12,7 +12,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) func init() { diff --git a/cmd/vet/main.go b/cmd/vet/main.go index 622acb7b..a58e18ac 100644 --- a/cmd/vet/main.go +++ b/cmd/vet/main.go @@ -21,8 +21,8 @@ import ( "strconv" "strings" - _ "code.google.com/p/go.tools/go/gcimporter" - "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + "golang.org/x/tools/go/types" ) // TODO: Need a flag to set build tags when parsing the package. @@ -159,7 +159,7 @@ func Usage() { fmt.Fprintf(os.Stderr, "\tvet [flags] directory...\n") fmt.Fprintf(os.Stderr, "\tvet [flags] files... # Must be a single package\n") fmt.Fprintf(os.Stderr, "For more information run\n") - fmt.Fprintf(os.Stderr, "\tgodoc code.google.com/p/go.tools/cmd/vet\n\n") + fmt.Fprintf(os.Stderr, "\tgodoc golang.org/x/tools/cmd/vet\n\n") fmt.Fprintf(os.Stderr, "Flags:\n") flag.PrintDefaults() os.Exit(2) diff --git a/cmd/vet/nilfunc.go b/cmd/vet/nilfunc.go index b89af411..fa1bac7e 100644 --- a/cmd/vet/nilfunc.go +++ b/cmd/vet/nilfunc.go @@ -13,7 +13,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) func init() { diff --git a/cmd/vet/print.go b/cmd/vet/print.go index 3288d59d..14de6ab5 100644 --- a/cmd/vet/print.go +++ b/cmd/vet/print.go @@ -15,8 +15,8 @@ import ( "strings" "unicode/utf8" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/types" ) var printfuncs = flag.String("printfuncs", "", "comma-separated list of print function names to check") diff --git a/cmd/vet/shadow.go b/cmd/vet/shadow.go index 4fc8cb70..34e5db90 100644 --- a/cmd/vet/shadow.go +++ b/cmd/vet/shadow.go @@ -35,7 +35,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) var strictShadowing = flag.Bool("shadowstrict", false, "whether to be strict about shadowing; can be noisy") diff --git a/cmd/vet/shift.go b/cmd/vet/shift.go index 1f9f804a..2385c23f 100644 --- a/cmd/vet/shift.go +++ b/cmd/vet/shift.go @@ -12,8 +12,8 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/types" ) func init() { diff --git a/cmd/vet/types.go b/cmd/vet/types.go index 9f762dd5..0a2a248a 100644 --- a/cmd/vet/types.go +++ b/cmd/vet/types.go @@ -10,7 +10,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // imports is the canonical map of imported packages we need for typechecking. diff --git a/cmd/vet/unsafeptr.go b/cmd/vet/unsafeptr.go index 652ffbfa..ca15f725 100644 --- a/cmd/vet/unsafeptr.go +++ b/cmd/vet/unsafeptr.go @@ -10,7 +10,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) func init() { diff --git a/container/intsets/sparse_test.go b/container/intsets/sparse_test.go index 727e1672..a00cbb32 100644 --- a/container/intsets/sparse_test.go +++ b/container/intsets/sparse_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "code.google.com/p/go.tools/container/intsets" + "golang.org/x/tools/container/intsets" ) func TestBasics(t *testing.T) { diff --git a/dashboard/app/build/dash.go b/dashboard/app/build/dash.go index 52ca74da..e00b0311 100644 --- a/dashboard/app/build/dash.go +++ b/dashboard/app/build/dash.go @@ -61,47 +61,47 @@ var goPackages = []*Package{ { Kind: "subrepo", Name: "go.blog", - Path: "code.google.com/p/go.blog", + Path: "golang.org/x/blog", }, { Kind: "subrepo", Name: "go.codereview", - Path: "code.google.com/p/go.codereview", + Path: "golang.org/x/codereview", }, { Kind: "subrepo", Name: "go.crypto", - Path: "code.google.com/p/go.crypto", + Path: "golang.org/x/crypto", }, { Kind: "subrepo", Name: "go.exp", - Path: "code.google.com/p/go.exp", + Path: "golang.org/x/exp", }, { Kind: "subrepo", Name: "go.image", - Path: "code.google.com/p/go.image", + Path: "golang.org/x/image", }, { Kind: "subrepo", Name: "go.net", - Path: "code.google.com/p/go.net", + Path: "golang.org/x/net", }, { Kind: "subrepo", Name: "go.sys", - Path: "code.google.com/p/go.sys", + Path: "golang.org/x/sys", }, { Kind: "subrepo", Name: "go.talks", - Path: "code.google.com/p/go.talks", + Path: "golang.org/x/talks", }, { Kind: "subrepo", Name: "go.tools", - Path: "code.google.com/p/go.tools", + Path: "golang.org/x/tools", }, } diff --git a/dashboard/app/build/test.go b/dashboard/app/build/test.go index 86b2197f..34a1c39f 100644 --- a/dashboard/app/build/test.go +++ b/dashboard/app/build/test.go @@ -41,7 +41,7 @@ var testEntityKinds = []string{ "Log", } -const testPkg = "code.google.com/p/go.test" +const testPkg = "golang.org/x/test" var testPackage = &Package{Name: "Test", Kind: "subrepo", Path: testPkg} diff --git a/dashboard/builder/env.go b/dashboard/builder/env.go index 18bbbe01..b97db998 100644 --- a/dashboard/builder/env.go +++ b/dashboard/builder/env.go @@ -15,7 +15,7 @@ import ( "runtime" "strings" - "code.google.com/p/go.tools/go/vcs" + "golang.org/x/tools/go/vcs" ) // builderEnv represents the environment that a Builder will run tests in. diff --git a/dashboard/builder/main.go b/dashboard/builder/main.go index eec05857..a5caf087 100644 --- a/dashboard/builder/main.go +++ b/dashboard/builder/main.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "code.google.com/p/go.tools/go/vcs" + "golang.org/x/tools/go/vcs" ) const ( @@ -55,7 +55,7 @@ var ( buildTool = flag.String("tool", "go", "Tool to build.") gcPath = flag.String("gcpath", "code.google.com/p/go", "Path to download gc from") gccPath = flag.String("gccpath", "https://github.com/mirrors/gcc.git", "Path to download gcc from") - benchPath = flag.String("benchpath", "code.google.com/p/go.benchmarks/bench", "Path to download benchmarks from") + benchPath = flag.String("benchpath", "golang.org/x/benchmarks/bench", "Path to download benchmarks from") failAll = flag.Bool("fail", false, "fail all builds") parallel = flag.Bool("parallel", false, "Build multiple targets in parallel") buildTimeout = flag.Duration("buildTimeout", 60*time.Minute, "Maximum time to wait for builds and tests") diff --git a/dashboard/builder/vcs.go b/dashboard/builder/vcs.go index e31c4ce5..9d94bdc3 100644 --- a/dashboard/builder/vcs.go +++ b/dashboard/builder/vcs.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - "code.google.com/p/go.tools/go/vcs" + "golang.org/x/tools/go/vcs" ) // Repo represents a mercurial repository. diff --git a/dashboard/env/linux-x86-base/scripts/build-go-builder.sh b/dashboard/env/linux-x86-base/scripts/build-go-builder.sh index 1448fc56..097ac171 100755 --- a/dashboard/env/linux-x86-base/scripts/build-go-builder.sh +++ b/dashboard/env/linux-x86-base/scripts/build-go-builder.sh @@ -10,11 +10,11 @@ mkdir -p $GOROOT curl -s https://storage.googleapis.com/gobuilder/go-snap.tar.gz | tar x --no-same-owner -zv -C $GOROOT (cd $GOROOT/src && hg pull -r $GO_REV -u && find && ./make.bash) -GO_TOOLS=$GOPATH/src/code.google.com/p/go.tools +GO_TOOLS=$GOPATH/src/golang.org/x/tools mkdir -p $GO_TOOLS curl -s https://storage.googleapis.com/gobuilder/go.tools-snap.tar.gz | tar x --no-same-owner -zv -C $GO_TOOLS mkdir -p $PREFIX/bin -(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install code.google.com/p/go.tools/dashboard/builder) +(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH diff --git a/dashboard/env/linux-x86-clang/scripts/build-go-builder.sh b/dashboard/env/linux-x86-clang/scripts/build-go-builder.sh index 1448fc56..097ac171 100755 --- a/dashboard/env/linux-x86-clang/scripts/build-go-builder.sh +++ b/dashboard/env/linux-x86-clang/scripts/build-go-builder.sh @@ -10,11 +10,11 @@ mkdir -p $GOROOT curl -s https://storage.googleapis.com/gobuilder/go-snap.tar.gz | tar x --no-same-owner -zv -C $GOROOT (cd $GOROOT/src && hg pull -r $GO_REV -u && find && ./make.bash) -GO_TOOLS=$GOPATH/src/code.google.com/p/go.tools +GO_TOOLS=$GOPATH/src/golang.org/x/tools mkdir -p $GO_TOOLS curl -s https://storage.googleapis.com/gobuilder/go.tools-snap.tar.gz | tar x --no-same-owner -zv -C $GO_TOOLS mkdir -p $PREFIX/bin -(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install code.google.com/p/go.tools/dashboard/builder) +(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH diff --git a/dashboard/env/linux-x86-nacl/scripts/build-go-builder.sh b/dashboard/env/linux-x86-nacl/scripts/build-go-builder.sh index c4a79623..10bf847b 100755 --- a/dashboard/env/linux-x86-nacl/scripts/build-go-builder.sh +++ b/dashboard/env/linux-x86-nacl/scripts/build-go-builder.sh @@ -10,12 +10,12 @@ mkdir -p $GOROOT curl -s https://storage.googleapis.com/gobuilder/go-snap.tar.gz | tar x --no-same-owner -zv -C $GOROOT (cd $GOROOT/src && hg pull -r $GO_REV -u && find && ./make.bash) -GO_TOOLS=$GOPATH/src/code.google.com/p/go.tools +GO_TOOLS=$GOPATH/src/golang.org/x/tools mkdir -p $GO_TOOLS curl -s https://storage.googleapis.com/gobuilder/go.tools-snap.tar.gz | tar x --no-same-owner -zv -C $GO_TOOLS mkdir -p $PREFIX/bin -(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install code.google.com/p/go.tools/dashboard/builder) +(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH diff --git a/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh b/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh index 1448fc56..097ac171 100755 --- a/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh +++ b/dashboard/env/linux-x86-sid/scripts/build-go-builder.sh @@ -10,11 +10,11 @@ mkdir -p $GOROOT curl -s https://storage.googleapis.com/gobuilder/go-snap.tar.gz | tar x --no-same-owner -zv -C $GOROOT (cd $GOROOT/src && hg pull -r $GO_REV -u && find && ./make.bash) -GO_TOOLS=$GOPATH/src/code.google.com/p/go.tools +GO_TOOLS=$GOPATH/src/golang.org/x/tools mkdir -p $GO_TOOLS curl -s https://storage.googleapis.com/gobuilder/go.tools-snap.tar.gz | tar x --no-same-owner -zv -C $GO_TOOLS mkdir -p $PREFIX/bin -(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install code.google.com/p/go.tools/dashboard/builder) +(cd $GO_TOOLS && hg pull -r $BUILDER_REV -u && GOBIN=$PREFIX/bin /goroot/bin/go install golang.org/x/tools/dashboard/builder) rm -fR $GOROOT/bin $GOROOT/pkg $GOPATH diff --git a/dashboard/watcher/watcher.go b/dashboard/watcher/watcher.go index c7d3c5cc..7c145f58 100644 --- a/dashboard/watcher/watcher.go +++ b/dashboard/watcher/watcher.go @@ -548,7 +548,7 @@ func readKey() (string, error) { // subrepoList fetches a list of sub-repositories from the dashboard // and returns them as a slice of base import paths. -// Eg, []string{"code.google.com/p/go.tools", "code.google.com/p/go.net"}. +// Eg, []string{"golang.org/x/tools", "golang.org/x/net"}. func subrepoList() ([]string, error) { r, err := http.Get(*dashboard + "packages?kind=subrepo") if err != nil { diff --git a/go/buildutil/allpackages_test.go b/go/buildutil/allpackages_test.go index ee741d96..552ad6c8 100644 --- a/go/buildutil/allpackages_test.go +++ b/go/buildutil/allpackages_test.go @@ -8,7 +8,7 @@ import ( "go/build" "testing" - "code.google.com/p/go.tools/go/buildutil" + "golang.org/x/tools/go/buildutil" ) func TestAllPackages(t *testing.T) { @@ -24,7 +24,7 @@ func TestAllPackages(t *testing.T) { t.Errorf("Found only %d packages, want at least %d", len(all), wantAtLeast) } - for _, want := range []string{"fmt", "crypto/sha256", "code.google.com/p/go.tools/go/buildutil"} { + for _, want := range []string{"fmt", "crypto/sha256", "golang.org/x/tools/go/buildutil"} { if !set[want] { t.Errorf("Package %q not found; got %s", want, all) } diff --git a/go/buildutil/util_test.go b/go/buildutil/util_test.go index f0db26c7..f156829e 100644 --- a/go/buildutil/util_test.go +++ b/go/buildutil/util_test.go @@ -11,7 +11,7 @@ import ( "runtime" "testing" - "code.google.com/p/go.tools/go/buildutil" + "golang.org/x/tools/go/buildutil" ) func TestContainingPackage(t *testing.T) { @@ -23,8 +23,8 @@ func TestContainingPackage(t *testing.T) { {goroot + "/src/fmt/print.go", "fmt"}, {goroot + "/src/encoding/json/foo.go", "encoding/json"}, {goroot + "/src/encoding/missing/foo.go", "(not found)"}, - {gopath + "/src/code.google.com/p/go.tools/go/buildutil/util_test.go", - "code.google.com/p/go.tools/go/buildutil"}, + {gopath + "/src/golang.org/x/tools/go/buildutil/util_test.go", + "golang.org/x/tools/go/buildutil"}, } { file, want := test[0], test[1] bp, err := buildutil.ContainingPackage(&build.Default, ".", file) diff --git a/go/callgraph/callgraph.go b/go/callgraph/callgraph.go index 68ed2302..d0e12d87 100644 --- a/go/callgraph/callgraph.go +++ b/go/callgraph/callgraph.go @@ -43,7 +43,7 @@ import ( "fmt" "go/token" - "code.google.com/p/go.tools/go/ssa" + "golang.org/x/tools/go/ssa" ) // A Graph represents a call graph. diff --git a/go/callgraph/util.go b/go/callgraph/util.go index 2532fd8c..a8f89031 100644 --- a/go/callgraph/util.go +++ b/go/callgraph/util.go @@ -4,7 +4,7 @@ package callgraph -import "code.google.com/p/go.tools/go/ssa" +import "golang.org/x/tools/go/ssa" // This file provides various utilities over call graphs, such as // visitation and path search. diff --git a/go/gccgoimporter/gccgoinstallation.go b/go/gccgoimporter/gccgoinstallation.go index 266fbac8..1c56cf5a 100644 --- a/go/gccgoimporter/gccgoinstallation.go +++ b/go/gccgoimporter/gccgoinstallation.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // Information about a specific installation of gccgo. diff --git a/go/gccgoimporter/gccgoinstallation_test.go b/go/gccgoimporter/gccgoinstallation_test.go index 64c9890d..9ab928dc 100644 --- a/go/gccgoimporter/gccgoinstallation_test.go +++ b/go/gccgoimporter/gccgoinstallation_test.go @@ -8,7 +8,7 @@ import ( "runtime" "testing" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) var importablePackages = [...]string{ diff --git a/go/gccgoimporter/importer.go b/go/gccgoimporter/importer.go index dc02383c..a2b772bf 100644 --- a/go/gccgoimporter/importer.go +++ b/go/gccgoimporter/importer.go @@ -16,8 +16,8 @@ import ( "path/filepath" "strings" - "code.google.com/p/go.tools/go/importer" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/importer" + "golang.org/x/tools/go/types" ) // A PackageInit describes an imported package that needs initialization. diff --git a/go/gccgoimporter/importer_test.go b/go/gccgoimporter/importer_test.go index 22767683..722151f8 100644 --- a/go/gccgoimporter/importer_test.go +++ b/go/gccgoimporter/importer_test.go @@ -12,7 +12,7 @@ import ( "runtime" "testing" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) type importerTest struct { diff --git a/go/gccgoimporter/parser.go b/go/gccgoimporter/parser.go index 6c4faf6c..883c3501 100644 --- a/go/gccgoimporter/parser.go +++ b/go/gccgoimporter/parser.go @@ -14,8 +14,8 @@ import ( "strings" "text/scanner" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/types" ) type parser struct { diff --git a/go/gccgoimporter/parser_test.go b/go/gccgoimporter/parser_test.go index f084a630..1f0f12a2 100644 --- a/go/gccgoimporter/parser_test.go +++ b/go/gccgoimporter/parser_test.go @@ -10,7 +10,7 @@ import ( "testing" "text/scanner" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) var typeParserTests = []struct { diff --git a/go/gcimporter/gcimporter.go b/go/gcimporter/gcimporter.go index f0e0412e..b6844b45 100644 --- a/go/gcimporter/gcimporter.go +++ b/go/gcimporter/gcimporter.go @@ -19,8 +19,8 @@ import ( "strings" "text/scanner" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/types" ) // debugging/development support diff --git a/go/gcimporter/gcimporter_test.go b/go/gcimporter/gcimporter_test.go index 877489be..a20853ac 100644 --- a/go/gcimporter/gcimporter_test.go +++ b/go/gcimporter/gcimporter_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) var gcPath string // Go compiler path diff --git a/go/importer/export.go b/go/importer/export.go index 95799630..5930eafc 100644 --- a/go/importer/export.go +++ b/go/importer/export.go @@ -11,8 +11,8 @@ import ( "go/ast" "strings" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/types" ) // debugging support diff --git a/go/importer/import.go b/go/importer/import.go index 16c6eba3..3604c98e 100644 --- a/go/importer/import.go +++ b/go/importer/import.go @@ -14,8 +14,8 @@ import ( "fmt" "go/token" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/types" ) // ImportData imports a package from the serialized package data diff --git a/go/importer/import_test.go b/go/importer/import_test.go index d21ad7e5..3a2560c1 100644 --- a/go/importer/import_test.go +++ b/go/importer/import_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "code.google.com/p/go.tools/go/gcimporter" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/gcimporter" + "golang.org/x/tools/go/types" ) var fset = token.NewFileSet() diff --git a/go/importer/predefined.go b/go/importer/predefined.go index 3965b0a7..a4db5688 100644 --- a/go/importer/predefined.go +++ b/go/importer/predefined.go @@ -4,7 +4,7 @@ package importer -import "code.google.com/p/go.tools/go/types" +import "golang.org/x/tools/go/types" const ( magic = "\n$$ exports $$\n" diff --git a/go/loader/loader.go b/go/loader/loader.go index f64b3b6f..566108fa 100644 --- a/go/loader/loader.go +++ b/go/loader/loader.go @@ -136,9 +136,9 @@ import ( "os" "strings" - "code.google.com/p/go.tools/astutil" - "code.google.com/p/go.tools/go/gcimporter" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/astutil" + "golang.org/x/tools/go/gcimporter" + "golang.org/x/tools/go/types" ) // Config specifies the configuration for a program to load. diff --git a/go/loader/loader_test.go b/go/loader/loader_test.go index 0421ec08..c239c632 100644 --- a/go/loader/loader_test.go +++ b/go/loader/loader_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "code.google.com/p/go.tools/go/loader" + "golang.org/x/tools/go/loader" ) func loadFromArgs(args []string) (prog *loader.Program, rest []string, err error) { diff --git a/go/loader/source_test.go b/go/loader/source_test.go index 919237d8..d0ca4a75 100644 --- a/go/loader/source_test.go +++ b/go/loader/source_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" - "code.google.com/p/go.tools/astutil" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/ssa" + "golang.org/x/tools/astutil" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/ssa" ) // findInterval parses input and returns the [start, end) positions of diff --git a/go/loader/stdlib_test.go b/go/loader/stdlib_test.go index 69942645..eb439a15 100644 --- a/go/loader/stdlib_test.go +++ b/go/loader/stdlib_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "code.google.com/p/go.tools/go/buildutil" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/buildutil" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" ) func TestStdlib(t *testing.T) { diff --git a/go/pointer/analysis.go b/go/pointer/analysis.go index bc68795f..8887a866 100644 --- a/go/pointer/analysis.go +++ b/go/pointer/analysis.go @@ -16,10 +16,10 @@ import ( "runtime/debug" "sort" - "code.google.com/p/go.tools/go/callgraph" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/go/types/typeutil" + "golang.org/x/tools/go/callgraph" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" + "golang.org/x/tools/go/types/typeutil" ) const ( diff --git a/go/pointer/api.go b/go/pointer/api.go index 890017a0..a81c586d 100644 --- a/go/pointer/api.go +++ b/go/pointer/api.go @@ -10,10 +10,10 @@ import ( "go/token" "io" - "code.google.com/p/go.tools/container/intsets" - "code.google.com/p/go.tools/go/callgraph" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types/typeutil" + "golang.org/x/tools/container/intsets" + "golang.org/x/tools/go/callgraph" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types/typeutil" ) // A Config formulates a pointer analysis problem for Analyze(). diff --git a/go/pointer/callgraph.go b/go/pointer/callgraph.go index 67062919..48e152e4 100644 --- a/go/pointer/callgraph.go +++ b/go/pointer/callgraph.go @@ -10,7 +10,7 @@ import ( "fmt" "go/token" - "code.google.com/p/go.tools/go/ssa" + "golang.org/x/tools/go/ssa" ) type cgnode struct { diff --git a/go/pointer/constraint.go b/go/pointer/constraint.go index 0f363b90..e6371ccc 100644 --- a/go/pointer/constraint.go +++ b/go/pointer/constraint.go @@ -5,7 +5,7 @@ package pointer import ( - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) type constraint interface { diff --git a/go/pointer/example_test.go b/go/pointer/example_test.go index 3606ed69..eecfd30f 100644 --- a/go/pointer/example_test.go +++ b/go/pointer/example_test.go @@ -8,10 +8,10 @@ import ( "fmt" "sort" - "code.google.com/p/go.tools/go/callgraph" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/pointer" - "code.google.com/p/go.tools/go/ssa" + "golang.org/x/tools/go/callgraph" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/pointer" + "golang.org/x/tools/go/ssa" ) // This program demonstrates how to use the pointer analysis to diff --git a/go/pointer/gen.go b/go/pointer/gen.go index cfd82414..12f4d796 100644 --- a/go/pointer/gen.go +++ b/go/pointer/gen.go @@ -14,9 +14,9 @@ import ( "fmt" "go/token" - "code.google.com/p/go.tools/go/callgraph" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/callgraph" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) var ( diff --git a/go/pointer/hvn.go b/go/pointer/hvn.go index 0e1c6b24..a3ef1f34 100644 --- a/go/pointer/hvn.go +++ b/go/pointer/hvn.go @@ -162,8 +162,8 @@ import ( "io" "reflect" - "code.google.com/p/go.tools/container/intsets" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/container/intsets" + "golang.org/x/tools/go/types" ) // A peLabel is a pointer-equivalence label: two nodes with the same diff --git a/go/pointer/intrinsics.go b/go/pointer/intrinsics.go index cb0100e9..251c0e27 100644 --- a/go/pointer/intrinsics.go +++ b/go/pointer/intrinsics.go @@ -18,8 +18,8 @@ package pointer import ( "fmt" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) // Instances of 'intrinsic' generate analysis constraints for calls to diff --git a/go/pointer/labels.go b/go/pointer/labels.go index 48a9f0b9..cf6ef20f 100644 --- a/go/pointer/labels.go +++ b/go/pointer/labels.go @@ -9,8 +9,8 @@ import ( "go/token" "strings" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) // A Label is an entity that may be pointed to by a pointer, map, diff --git a/go/pointer/pointer_test.go b/go/pointer/pointer_test.go index 7c106931..aeffb5c5 100644 --- a/go/pointer/pointer_test.go +++ b/go/pointer/pointer_test.go @@ -21,13 +21,13 @@ import ( "strings" "testing" - "code.google.com/p/go.tools/go/callgraph" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/pointer" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/ssa/ssautil" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/go/types/typeutil" + "golang.org/x/tools/go/callgraph" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/pointer" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/ssa/ssautil" + "golang.org/x/tools/go/types" + "golang.org/x/tools/go/types/typeutil" ) var inputs = []string{ diff --git a/go/pointer/reflect.go b/go/pointer/reflect.go index 6e5c54ca..7e9c280c 100644 --- a/go/pointer/reflect.go +++ b/go/pointer/reflect.go @@ -28,9 +28,9 @@ import ( "fmt" "reflect" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) func init() { diff --git a/go/pointer/solve.go b/go/pointer/solve.go index ce5d07c6..ad1a65f5 100644 --- a/go/pointer/solve.go +++ b/go/pointer/solve.go @@ -10,7 +10,7 @@ package pointer import ( "fmt" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) type solverState struct { diff --git a/go/pointer/stdlib_test.go b/go/pointer/stdlib_test.go index c5869ec5..214cdfcf 100644 --- a/go/pointer/stdlib_test.go +++ b/go/pointer/stdlib_test.go @@ -10,7 +10,7 @@ package pointer // // Because it is relatively slow, the --stdlib flag must be enabled for // this test to run: -// % go test -v code.google.com/p/go.tools/go/pointer --stdlib +// % go test -v golang.org/x/tools/go/pointer --stdlib import ( "flag" @@ -19,10 +19,10 @@ import ( "testing" "time" - "code.google.com/p/go.tools/go/buildutil" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/ssa/ssautil" + "golang.org/x/tools/go/buildutil" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/ssa/ssautil" ) var runStdlibTest = flag.Bool("stdlib", false, "Run the (slow) stdlib test") diff --git a/go/pointer/util.go b/go/pointer/util.go index e3ac4fce..88bada89 100644 --- a/go/pointer/util.go +++ b/go/pointer/util.go @@ -13,8 +13,8 @@ import ( "runtime" "time" - "code.google.com/p/go.tools/container/intsets" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/container/intsets" + "golang.org/x/tools/go/types" ) // CanPoint reports whether the type T is pointerlike, diff --git a/go/ssa/builder.go b/go/ssa/builder.go index e45bffa8..6e1739c9 100644 --- a/go/ssa/builder.go +++ b/go/ssa/builder.go @@ -37,8 +37,8 @@ import ( "sync" "sync/atomic" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/types" ) type opaqueType struct { diff --git a/go/ssa/builder_test.go b/go/ssa/builder_test.go index 1df98b57..858db4b7 100644 --- a/go/ssa/builder_test.go +++ b/go/ssa/builder_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) func isEmpty(f *ssa.Function) bool { return f.Blocks == nil } diff --git a/go/ssa/const.go b/go/ssa/const.go index 44a1ee78..304096eb 100644 --- a/go/ssa/const.go +++ b/go/ssa/const.go @@ -11,8 +11,8 @@ import ( "go/token" "strconv" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/types" ) // NewConst returns a new constant of the specified value and type. diff --git a/go/ssa/create.go b/go/ssa/create.go index 7a3629ed..7f57101d 100644 --- a/go/ssa/create.go +++ b/go/ssa/create.go @@ -13,8 +13,8 @@ import ( "os" "sync" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" ) // BuilderMode is a bitmask of options for diagnostics and checking. diff --git a/go/ssa/emit.go b/go/ssa/emit.go index 0963d4fb..84246c6b 100644 --- a/go/ssa/emit.go +++ b/go/ssa/emit.go @@ -11,7 +11,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // emitNew emits to f a new (heap Alloc) instruction allocating an diff --git a/go/ssa/example_test.go b/go/ssa/example_test.go index f78ce632..5253c882 100644 --- a/go/ssa/example_test.go +++ b/go/ssa/example_test.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/ssa" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/ssa" ) // This program demonstrates how to run the SSA builder on a "Hello, @@ -26,7 +26,7 @@ import ( // // Build and run the ssadump.go program if you want a standalone tool // with similar functionality. It is located at -// code.google.com/p/go.tools/cmd/ssadump. +// golang.org/x/tools/cmd/ssadump. // func Example() { const hello = ` diff --git a/go/ssa/func.go b/go/ssa/func.go index 52c49917..3f08d3e1 100644 --- a/go/ssa/func.go +++ b/go/ssa/func.go @@ -15,7 +15,7 @@ import ( "os" "strings" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // addEdge adds a control-flow graph edge from from to to. diff --git a/go/ssa/interp/external.go b/go/ssa/interp/external.go index 26a39da0..e3a8ee07 100644 --- a/go/ssa/interp/external.go +++ b/go/ssa/interp/external.go @@ -15,8 +15,8 @@ import ( "time" "unsafe" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) type externalFn func(fr *frame, args []value) value diff --git a/go/ssa/interp/interp.go b/go/ssa/interp/interp.go index 80c620ca..d674c25a 100644 --- a/go/ssa/interp/interp.go +++ b/go/ssa/interp/interp.go @@ -51,8 +51,8 @@ import ( "reflect" "runtime" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) type continuation int diff --git a/go/ssa/interp/interp_test.go b/go/ssa/interp/interp_test.go index a7329602..456fdaf7 100644 --- a/go/ssa/interp/interp_test.go +++ b/go/ssa/interp/interp_test.go @@ -16,10 +16,10 @@ import ( "testing" "time" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/ssa/interp" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/ssa/interp" + "golang.org/x/tools/go/types" ) // Each line contains a space-separated list of $GOROOT/test/ @@ -208,7 +208,7 @@ func run(t *testing.T, dir, input string, success successPredicate) bool { interp.CapturedOutput = nil }() - hint = fmt.Sprintf("To dump SSA representation, run:\n%% go build code.google.com/p/go.tools/cmd/ssadump && ./ssadump -build=CFP %s\n", input) + hint = fmt.Sprintf("To dump SSA representation, run:\n%% go build golang.org/x/tools/cmd/ssadump && ./ssadump -build=CFP %s\n", input) iprog, err := conf.Load() if err != nil { @@ -247,7 +247,7 @@ func run(t *testing.T, dir, input string, success successPredicate) bool { var out bytes.Buffer interp.CapturedOutput = &out - hint = fmt.Sprintf("To trace execution, run:\n%% go build code.google.com/p/go.tools/cmd/ssadump && ./ssadump -build=C -run --interp=T %s\n", input) + hint = fmt.Sprintf("To trace execution, run:\n%% go build golang.org/x/tools/cmd/ssadump && ./ssadump -build=C -run --interp=T %s\n", input) exitCode := interp.Interpret(mainPkg, 0, &types.StdSizes{8, 8}, inputs[0], []string{}) // The definition of success varies with each file. diff --git a/go/ssa/interp/map.go b/go/ssa/interp/map.go index 5e93e7f7..5dbaf0a9 100644 --- a/go/ssa/interp/map.go +++ b/go/ssa/interp/map.go @@ -12,7 +12,7 @@ package interp // concurrent map access. import ( - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) type hashable interface { diff --git a/go/ssa/interp/ops.go b/go/ssa/interp/ops.go index b1fca002..fe7d679e 100644 --- a/go/ssa/interp/ops.go +++ b/go/ssa/interp/ops.go @@ -12,9 +12,9 @@ import ( "sync" "unsafe" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) // If the target program panics, the interpreter panics with this type. diff --git a/go/ssa/interp/reflect.go b/go/ssa/interp/reflect.go index 91a0b301..051695cc 100644 --- a/go/ssa/interp/reflect.go +++ b/go/ssa/interp/reflect.go @@ -16,8 +16,8 @@ import ( "reflect" "unsafe" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) type opaqueType struct { diff --git a/go/ssa/interp/value.go b/go/ssa/interp/value.go index f3257b96..a8d27eeb 100644 --- a/go/ssa/interp/value.go +++ b/go/ssa/interp/value.go @@ -42,9 +42,9 @@ import ( "sync" "unsafe" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/go/types/typeutil" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" + "golang.org/x/tools/go/types/typeutil" ) type value interface{} diff --git a/go/ssa/lift.go b/go/ssa/lift.go index 1f190fe4..3771f61f 100644 --- a/go/ssa/lift.go +++ b/go/ssa/lift.go @@ -47,7 +47,7 @@ import ( "math/big" "os" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // If true, perform sanity checking and show diagnostic information at diff --git a/go/ssa/lvalue.go b/go/ssa/lvalue.go index 2e8eb9d0..e58bc247 100644 --- a/go/ssa/lvalue.go +++ b/go/ssa/lvalue.go @@ -11,7 +11,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // An lvalue represents an assignable location that may appear on the diff --git a/go/ssa/methods.go b/go/ssa/methods.go index 322c885f..1ef725cf 100644 --- a/go/ssa/methods.go +++ b/go/ssa/methods.go @@ -9,7 +9,7 @@ package ssa import ( "fmt" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // Method returns the Function implementing method sel, building diff --git a/go/ssa/print.go b/go/ssa/print.go index f9b3d17a..9fda3a48 100644 --- a/go/ssa/print.go +++ b/go/ssa/print.go @@ -14,8 +14,8 @@ import ( "reflect" "sort" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/go/types/typeutil" + "golang.org/x/tools/go/types" + "golang.org/x/tools/go/types/typeutil" ) // relName returns the name of v relative to i. diff --git a/go/ssa/sanity.go b/go/ssa/sanity.go index 69d80e27..3fd67472 100644 --- a/go/ssa/sanity.go +++ b/go/ssa/sanity.go @@ -13,7 +13,7 @@ import ( "os" "strings" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) type sanity struct { diff --git a/go/ssa/source.go b/go/ssa/source.go index 8f0d0f35..02b0260f 100644 --- a/go/ssa/source.go +++ b/go/ssa/source.go @@ -14,7 +14,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // EnclosingFunction returns the function that contains the syntax diff --git a/go/ssa/source_test.go b/go/ssa/source_test.go index 0fa68d89..203da7f3 100644 --- a/go/ssa/source_test.go +++ b/go/ssa/source_test.go @@ -16,11 +16,11 @@ import ( "strings" "testing" - "code.google.com/p/go.tools/astutil" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/astutil" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) func TestObjValueLookup(t *testing.T) { diff --git a/go/ssa/ssa.go b/go/ssa/ssa.go index 09fa75f8..85439921 100644 --- a/go/ssa/ssa.go +++ b/go/ssa/ssa.go @@ -13,10 +13,10 @@ import ( "go/token" "sync" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/go/types/typeutil" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" + "golang.org/x/tools/go/types/typeutil" ) // A Program is a partial or complete Go program converted to SSA form. diff --git a/go/ssa/ssautil/switch.go b/go/ssa/ssautil/switch.go index ae030c49..70fff9c8 100644 --- a/go/ssa/ssautil/switch.go +++ b/go/ssa/ssautil/switch.go @@ -23,8 +23,8 @@ import ( "fmt" "go/token" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) // A ConstCase represents a single constant comparison. diff --git a/go/ssa/ssautil/switch_test.go b/go/ssa/ssautil/switch_test.go index 86d5bfb2..ae110584 100644 --- a/go/ssa/ssautil/switch_test.go +++ b/go/ssa/ssautil/switch_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/ssa/ssautil" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/ssa/ssautil" ) func TestSwitches(t *testing.T) { diff --git a/go/ssa/ssautil/visit.go b/go/ssa/ssautil/visit.go index 6b8c5d21..8dc66946 100644 --- a/go/ssa/ssautil/visit.go +++ b/go/ssa/ssautil/visit.go @@ -4,7 +4,7 @@ package ssautil -import "code.google.com/p/go.tools/go/ssa" +import "golang.org/x/tools/go/ssa" // This file defines utilities for visiting the SSA representation of // a Program. diff --git a/go/ssa/stdlib_test.go b/go/ssa/stdlib_test.go index bfe72169..c45923b0 100644 --- a/go/ssa/stdlib_test.go +++ b/go/ssa/stdlib_test.go @@ -16,10 +16,10 @@ import ( "testing" "time" - "code.google.com/p/go.tools/go/buildutil" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/ssa/ssautil" + "golang.org/x/tools/go/buildutil" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/ssa/ssautil" ) func TestStdlib(t *testing.T) { diff --git a/go/ssa/testmain.go b/go/ssa/testmain.go index f11e3b71..422c7db9 100644 --- a/go/ssa/testmain.go +++ b/go/ssa/testmain.go @@ -14,7 +14,7 @@ import ( "os" "strings" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // FindTests returns the list of packages that define at least one Test, diff --git a/go/ssa/testmain_test.go b/go/ssa/testmain_test.go index 3a9eacc7..04a41fc3 100644 --- a/go/ssa/testmain_test.go +++ b/go/ssa/testmain_test.go @@ -12,8 +12,8 @@ import ( "sort" "testing" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/ssa" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/ssa" ) func create(t *testing.T, content string) []*ssa.Package { diff --git a/go/ssa/util.go b/go/ssa/util.go index 738ac7b8..1cf15e88 100644 --- a/go/ssa/util.go +++ b/go/ssa/util.go @@ -13,7 +13,7 @@ import ( "io" "os" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) func unreachable() { diff --git a/go/ssa/wrappers.go b/go/ssa/wrappers.go index d23075f2..10c8a64a 100644 --- a/go/ssa/wrappers.go +++ b/go/ssa/wrappers.go @@ -22,7 +22,7 @@ package ssa import ( "fmt" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // -- wrappers ----------------------------------------------------------- diff --git a/go/types/api.go b/go/types/api.go index 1bb89346..908b0f0e 100644 --- a/go/types/api.go +++ b/go/types/api.go @@ -28,7 +28,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) // Check type-checks a package and returns the resulting complete package @@ -118,7 +118,7 @@ type Config struct { // DefaultImport is the default importer invoked if Config.Import == nil. // The declaration: // -// import _ "code.google.com/p/go.tools/go/gcimporter" +// import _ "golang.org/x/tools/go/gcimporter" // // in a client of go/types will initialize DefaultImport to gcimporter.Import. var DefaultImport Importer diff --git a/go/types/api_test.go b/go/types/api_test.go index 9b698a18..ad3d30b8 100644 --- a/go/types/api_test.go +++ b/go/types/api_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - _ "code.google.com/p/go.tools/go/gcimporter" - . "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + . "golang.org/x/tools/go/types" ) func pkgFor(path, source string, info *Info) (*Package, error) { diff --git a/go/types/builtins.go b/go/types/builtins.go index 33d7ca39..fc0b7f72 100644 --- a/go/types/builtins.go +++ b/go/types/builtins.go @@ -10,7 +10,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) // builtin type-checks a call to the built-in specified by id and diff --git a/go/types/builtins_test.go b/go/types/builtins_test.go index 9164cf33..e7857994 100644 --- a/go/types/builtins_test.go +++ b/go/types/builtins_test.go @@ -10,8 +10,8 @@ import ( "go/parser" "testing" - _ "code.google.com/p/go.tools/go/gcimporter" - . "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + . "golang.org/x/tools/go/types" ) var builtinCalls = []struct { diff --git a/go/types/check.go b/go/types/check.go index 4c21984a..5b30a300 100644 --- a/go/types/check.go +++ b/go/types/check.go @@ -10,7 +10,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) // debugging/development support diff --git a/go/types/check_test.go b/go/types/check_test.go index dddae303..aefaa5a6 100644 --- a/go/types/check_test.go +++ b/go/types/check_test.go @@ -36,8 +36,8 @@ import ( "strings" "testing" - _ "code.google.com/p/go.tools/go/gcimporter" - . "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + . "golang.org/x/tools/go/types" ) var ( diff --git a/go/types/conversions.go b/go/types/conversions.go index e9518876..32cc8220 100644 --- a/go/types/conversions.go +++ b/go/types/conversions.go @@ -6,7 +6,7 @@ package types -import "code.google.com/p/go.tools/go/exact" +import "golang.org/x/tools/go/exact" // Conversion type-checks the conversion T(x). // The result is in x. diff --git a/go/types/decl.go b/go/types/decl.go index f0d07609..3273fd46 100644 --- a/go/types/decl.go +++ b/go/types/decl.go @@ -8,7 +8,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) func (check *Checker) reportAltDecl(obj Object) { diff --git a/go/types/eval.go b/go/types/eval.go index 549aadbf..3edb385d 100644 --- a/go/types/eval.go +++ b/go/types/eval.go @@ -12,7 +12,7 @@ import ( "go/parser" "go/token" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) // New is a convenience function to create a new type from a given diff --git a/go/types/eval_test.go b/go/types/eval_test.go index d9b68524..14d33273 100644 --- a/go/types/eval_test.go +++ b/go/types/eval_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - _ "code.google.com/p/go.tools/go/gcimporter" - . "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + . "golang.org/x/tools/go/types" ) func testEval(t *testing.T, pkg *Package, scope *Scope, str string, typ Type, typStr, valStr string) { diff --git a/go/types/expr.go b/go/types/expr.go index cda473f3..c55ce6a1 100644 --- a/go/types/expr.go +++ b/go/types/expr.go @@ -12,7 +12,7 @@ import ( "go/token" "math" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) /* diff --git a/go/types/exprstring_test.go b/go/types/exprstring_test.go index 86067154..cfd14722 100644 --- a/go/types/exprstring_test.go +++ b/go/types/exprstring_test.go @@ -8,7 +8,7 @@ import ( "go/parser" "testing" - . "code.google.com/p/go.tools/go/types" + . "golang.org/x/tools/go/types" ) var testExprs = []testEntry{ diff --git a/go/types/hilbert_test.go b/go/types/hilbert_test.go index 298d1ca7..b5557218 100644 --- a/go/types/hilbert_test.go +++ b/go/types/hilbert_test.go @@ -14,7 +14,7 @@ import ( "io/ioutil" "testing" - . "code.google.com/p/go.tools/go/types" + . "golang.org/x/tools/go/types" ) var ( diff --git a/go/types/issues_test.go b/go/types/issues_test.go index 95c6f675..04d8b371 100644 --- a/go/types/issues_test.go +++ b/go/types/issues_test.go @@ -14,8 +14,8 @@ import ( "strings" "testing" - _ "code.google.com/p/go.tools/go/gcimporter" - . "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + . "golang.org/x/tools/go/types" ) func TestIssue5770(t *testing.T) { diff --git a/go/types/object.go b/go/types/object.go index 37b3fc45..30bc31a5 100644 --- a/go/types/object.go +++ b/go/types/object.go @@ -10,7 +10,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) // TODO(gri) Document factory, accessor methods, and fields. General clean-up. diff --git a/go/types/operand.go b/go/types/operand.go index 2545da7b..7418eef9 100644 --- a/go/types/operand.go +++ b/go/types/operand.go @@ -11,7 +11,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) // An operandMode specifies the (addressing) mode of an operand. diff --git a/go/types/resolver.go b/go/types/resolver.go index 690c44fa..e8b28235 100644 --- a/go/types/resolver.go +++ b/go/types/resolver.go @@ -14,7 +14,7 @@ import ( "strings" "unicode" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) // A declInfo describes a package-level const, type, var, or func declaration. @@ -131,7 +131,7 @@ func (check *Checker) collectObjects() { importer := check.conf.Import if importer == nil { if DefaultImport == nil { - panic(`no Config.Import or DefaultImport (missing import _ "code.google.com/p/go.tools/go/gcimporter"?)`) + panic(`no Config.Import or DefaultImport (missing import _ "golang.org/x/tools/go/gcimporter"?)`) } importer = DefaultImport } diff --git a/go/types/resolver_test.go b/go/types/resolver_test.go index 9fc98931..d8af7a01 100644 --- a/go/types/resolver_test.go +++ b/go/types/resolver_test.go @@ -12,8 +12,8 @@ import ( "sort" "testing" - _ "code.google.com/p/go.tools/go/gcimporter" - . "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + . "golang.org/x/tools/go/types" ) var sources = []string{ diff --git a/go/types/self_test.go b/go/types/self_test.go index e7342de7..01d12c71 100644 --- a/go/types/self_test.go +++ b/go/types/self_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - _ "code.google.com/p/go.tools/go/gcimporter" - . "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + . "golang.org/x/tools/go/types" ) var benchmark = flag.Bool("b", false, "run benchmarks") diff --git a/go/types/stdlib_test.go b/go/types/stdlib_test.go index 310e11df..86290223 100644 --- a/go/types/stdlib_test.go +++ b/go/types/stdlib_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - _ "code.google.com/p/go.tools/go/gcimporter" - . "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + . "golang.org/x/tools/go/types" ) var ( diff --git a/go/types/stmt.go b/go/types/stmt.go index 9b96436b..42580bdd 100644 --- a/go/types/stmt.go +++ b/go/types/stmt.go @@ -11,7 +11,7 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) func (check *Checker) funcBody(decl *declInfo, name string, sig *Signature, body *ast.BlockStmt) { diff --git a/go/types/typestring_test.go b/go/types/typestring_test.go index b003cbb0..9aacf855 100644 --- a/go/types/typestring_test.go +++ b/go/types/typestring_test.go @@ -10,8 +10,8 @@ import ( "go/token" "testing" - _ "code.google.com/p/go.tools/go/gcimporter" - . "code.google.com/p/go.tools/go/types" + _ "golang.org/x/tools/go/gcimporter" + . "golang.org/x/tools/go/types" ) const filename = "" diff --git a/go/types/typeutil/imports.go b/go/types/typeutil/imports.go index b7b8f4fe..0f4a232d 100644 --- a/go/types/typeutil/imports.go +++ b/go/types/typeutil/imports.go @@ -1,6 +1,6 @@ package typeutil -import "code.google.com/p/go.tools/go/types" +import "golang.org/x/tools/go/types" // Dependencies returns all dependencies of the specified packages. // diff --git a/go/types/typeutil/imports_test.go b/go/types/typeutil/imports_test.go index aca6c1a0..6f207cf4 100644 --- a/go/types/typeutil/imports_test.go +++ b/go/types/typeutil/imports_test.go @@ -7,8 +7,8 @@ import ( "go/token" "testing" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/go/types/typeutil" + "golang.org/x/tools/go/types" + "golang.org/x/tools/go/types/typeutil" ) func TestDependencies(t *testing.T) { diff --git a/go/types/typeutil/map.go b/go/types/typeutil/map.go index 69c3f135..bf1ed2d9 100644 --- a/go/types/typeutil/map.go +++ b/go/types/typeutil/map.go @@ -11,7 +11,7 @@ import ( "fmt" "reflect" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // Map is a hash-table-based mapping from types (types.Type) to diff --git a/go/types/typeutil/map_test.go b/go/types/typeutil/map_test.go index 9d2a788e..776b5e2c 100644 --- a/go/types/typeutil/map_test.go +++ b/go/types/typeutil/map_test.go @@ -12,8 +12,8 @@ package typeutil_test import ( "testing" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/go/types/typeutil" + "golang.org/x/tools/go/types" + "golang.org/x/tools/go/types/typeutil" ) var ( diff --git a/go/types/typeutil/ui.go b/go/types/typeutil/ui.go index a17c1a4b..af42d2dd 100644 --- a/go/types/typeutil/ui.go +++ b/go/types/typeutil/ui.go @@ -6,7 +6,7 @@ package typeutil // This file defines utilities for user interfaces that display types. -import "code.google.com/p/go.tools/go/types" +import "golang.org/x/tools/go/types" // IntuitiveMethodSet returns the intuitive method set of a type, T. // diff --git a/go/types/typexpr.go b/go/types/typexpr.go index d9a4f204..8c4b679a 100644 --- a/go/types/typexpr.go +++ b/go/types/typexpr.go @@ -12,7 +12,7 @@ import ( "sort" "strconv" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) // ident type-checks identifier e and initializes x with the value or type of e. diff --git a/go/types/universe.go b/go/types/universe.go index 1494db0f..420f938a 100644 --- a/go/types/universe.go +++ b/go/types/universe.go @@ -10,7 +10,7 @@ import ( "go/token" "strings" - "code.google.com/p/go.tools/go/exact" + "golang.org/x/tools/go/exact" ) var ( diff --git a/godoc/analysis/analysis.go b/godoc/analysis/analysis.go index c4ba459f..26424953 100644 --- a/godoc/analysis/analysis.go +++ b/godoc/analysis/analysis.go @@ -57,11 +57,11 @@ import ( "strings" "sync" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/pointer" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/ssa/ssautil" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/pointer" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/ssa/ssautil" + "golang.org/x/tools/go/types" ) // -- links ------------------------------------------------------------ @@ -364,7 +364,7 @@ func Run(pta bool, result *Result) { } // Uncomment to make startup quicker during debugging. - //args = []string{"code.google.com/p/go.tools/cmd/godoc"} + //args = []string{"golang.org/x/tools/cmd/godoc"} //args = []string{"fmt"} if _, err := conf.FromArgs(args, true); err != nil { diff --git a/godoc/analysis/callgraph.go b/godoc/analysis/callgraph.go index 2442da73..149b60c0 100644 --- a/godoc/analysis/callgraph.go +++ b/godoc/analysis/callgraph.go @@ -16,9 +16,9 @@ import ( "math/big" "sort" - "code.google.com/p/go.tools/go/callgraph" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/callgraph" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) // doCallgraph computes the CALLEES and CALLERS relations. diff --git a/godoc/analysis/implements.go b/godoc/analysis/implements.go index c8067197..f951df48 100644 --- a/godoc/analysis/implements.go +++ b/godoc/analysis/implements.go @@ -13,7 +13,7 @@ package analysis import ( "sort" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) // computeImplements computes the "implements" relation over all pairs diff --git a/godoc/analysis/peers.go b/godoc/analysis/peers.go index aaf1896d..e1696e2f 100644 --- a/godoc/analysis/peers.go +++ b/godoc/analysis/peers.go @@ -15,9 +15,9 @@ import ( "fmt" "go/token" - "code.google.com/p/go.tools/go/pointer" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/pointer" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" ) func (a *analysis) doChannelPeers(ptsets map[ssa.Value]pointer.Pointer) { diff --git a/godoc/analysis/typeinfo.go b/godoc/analysis/typeinfo.go index d679a9f2..82f2f29d 100644 --- a/godoc/analysis/typeinfo.go +++ b/godoc/analysis/typeinfo.go @@ -24,9 +24,9 @@ import ( "strconv" "strings" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/go/types/typeutil" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" + "golang.org/x/tools/go/types/typeutil" ) // TODO(adonovan): audit to make sure it's safe on ill-typed packages. diff --git a/godoc/cmdline.go b/godoc/cmdline.go index 8a5a3212..5452ca3a 100644 --- a/godoc/cmdline.go +++ b/godoc/cmdline.go @@ -15,14 +15,14 @@ import ( "regexp" "strings" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/vfs" ) const ( target = "/target" cmdPrefix = "cmd/" srcPrefix = "src/" - toolsPath = "code.google.com/p/go.tools/cmd/" + toolsPath = "golang.org/x/tools/cmd/" ) // CommandLine returns godoc results to w. diff --git a/godoc/cmdline_test.go b/godoc/cmdline_test.go index 64e1c442..d21c55bd 100644 --- a/godoc/cmdline_test.go +++ b/godoc/cmdline_test.go @@ -12,8 +12,8 @@ import ( "testing" "text/template" - "code.google.com/p/go.tools/godoc/vfs" - "code.google.com/p/go.tools/godoc/vfs/mapfs" + "golang.org/x/tools/godoc/vfs" + "golang.org/x/tools/godoc/vfs/mapfs" ) // setupGoroot creates temporary directory to act as GOROOT when running tests diff --git a/godoc/corpus.go b/godoc/corpus.go index 021fb158..f2c7ebbf 100644 --- a/godoc/corpus.go +++ b/godoc/corpus.go @@ -9,9 +9,9 @@ import ( pathpkg "path" "time" - "code.google.com/p/go.tools/godoc/analysis" - "code.google.com/p/go.tools/godoc/util" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/analysis" + "golang.org/x/tools/godoc/util" + "golang.org/x/tools/godoc/vfs" ) // A Corpus holds all the state related to serving and indexing a diff --git a/godoc/index.go b/godoc/index.go index 73885f38..725121a5 100644 --- a/godoc/index.go +++ b/godoc/index.go @@ -62,8 +62,8 @@ import ( "time" "unicode" - "code.google.com/p/go.tools/godoc/util" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/util" + "golang.org/x/tools/godoc/vfs" ) // ---------------------------------------------------------------------------- diff --git a/godoc/index_test.go b/godoc/index_test.go index 562c97aa..a16bdcb6 100644 --- a/godoc/index_test.go +++ b/godoc/index_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "code.google.com/p/go.tools/godoc/vfs/mapfs" + "golang.org/x/tools/godoc/vfs/mapfs" ) func newCorpus(t *testing.T) *Corpus { diff --git a/godoc/meta.go b/godoc/meta.go index ae8ee5a9..41ade394 100644 --- a/godoc/meta.go +++ b/godoc/meta.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/vfs" ) var ( diff --git a/godoc/parser.go b/godoc/parser.go index 6ecad73f..4e644d6f 100644 --- a/godoc/parser.go +++ b/godoc/parser.go @@ -14,7 +14,7 @@ import ( "go/token" pathpkg "path" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/vfs" ) var linePrefix = []byte("//line ") diff --git a/godoc/pres.go b/godoc/pres.go index 2bf71f18..a8f8b2bc 100644 --- a/godoc/pres.go +++ b/godoc/pres.go @@ -10,7 +10,7 @@ import ( "sync" "text/template" - "code.google.com/p/go.tools/godoc/vfs/httpfs" + "golang.org/x/tools/godoc/vfs/httpfs" ) // SearchResultFunc functions return an HTML body for displaying search results. diff --git a/godoc/redirect/redirect.go b/godoc/redirect/redirect.go index 4fb58986..29e3c4e4 100644 --- a/godoc/redirect/redirect.go +++ b/godoc/redirect/redirect.go @@ -86,8 +86,8 @@ var redirects = map[string]string{ "/build": "http://build.golang.org", "/change": "https://code.google.com/p/go/source/list", "/cl": "https://gocodereview.appspot.com/", - "/cmd/godoc/": "http://godoc.org/code.google.com/p/go.tools/cmd/godoc/", - "/cmd/vet/": "http://godoc.org/code.google.com/p/go.tools/cmd/vet/", + "/cmd/godoc/": "http://godoc.org/golang.org/x/tools/cmd/godoc/", + "/cmd/vet/": "http://godoc.org/golang.org/x/tools/cmd/vet/", "/issue": "https://code.google.com/p/go/issues", "/issue/new": "https://code.google.com/p/go/issues/entry", "/issues": "https://code.google.com/p/go/issues", diff --git a/godoc/server.go b/godoc/server.go index 5923b790..7963cd0b 100644 --- a/godoc/server.go +++ b/godoc/server.go @@ -27,9 +27,9 @@ import ( "text/template" "time" - "code.google.com/p/go.tools/godoc/analysis" - "code.google.com/p/go.tools/godoc/util" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/analysis" + "golang.org/x/tools/godoc/util" + "golang.org/x/tools/godoc/vfs" ) // handlerServer is a migration from an old godoc http Handler type. diff --git a/godoc/static/doc.go b/godoc/static/doc.go index e1e75da2..5ef96ae0 100644 --- a/godoc/static/doc.go +++ b/godoc/static/doc.go @@ -4,5 +4,5 @@ // Package static exports a map of static file content that supports the godoc // user interface. The map should be used with the mapfs package, see -// code.google.com/p/go.tools/godoc/vfs/mapfs. +// golang.org/x/tools/godoc/vfs/mapfs. package static diff --git a/godoc/static/package.html b/godoc/static/package.html index cd5da3b9..cc69e619 100644 --- a/godoc/static/package.html +++ b/godoc/static/package.html @@ -289,13 +289,13 @@ Install them with "go get".

    -
  • crypto — additional cryptography packages.
    • -
  • image — additional imaging packages.
    • -
  • net — additional networking packages.
    • -
  • sys — packages for making system calls.
    • -
  • text — packages for working with text.
    • -
  • tools — godoc, vet, cover, and other tools.
    • -
  • exp — experimental code (handle with care; may change without warning).
    • +
  • crypto — additional cryptography packages.
    • +
  • image — additional imaging packages.
    • +
  • net — additional networking packages.
    • +
  • sys — packages for making system calls.
    • +
  • text — packages for working with text.
    • +
  • tools — godoc, vet, cover, and other tools.
    • +
  • exp — experimental code (handle with care; may change without warning).

Community

diff --git a/godoc/static/static.go b/godoc/static/static.go index 99d2dd52..593d4333 100644 --- a/godoc/static/static.go +++ b/godoc/static/static.go @@ -1800,13 +1800,13 @@ function cgAddChild(tree, ul, cgn) { Install them with "go get".

    -
  • crypto — additional cryptography packages.
    • -
  • image — additional imaging packages.
    • -
  • net — additional networking packages.
    • -
  • sys — packages for making system calls.
    • -
  • text — packages for working with text.
    • -
  • tools — godoc, vet, cover, and other tools.
    • -
  • exp — experimental code (handle with care; may change without warning).
    • +
  • crypto — additional cryptography packages.
    • +
  • image — additional imaging packages.
    • +
  • net — additional networking packages.
    • +
  • sys — packages for making system calls.
    • +
  • text — packages for working with text.
    • +
  • tools — godoc, vet, cover, and other tools.
    • +
  • exp — experimental code (handle with care; may change without warning).

Community

diff --git a/godoc/template.go b/godoc/template.go index 325bc8ca..eda5874d 100644 --- a/godoc/template.go +++ b/godoc/template.go @@ -38,7 +38,7 @@ import ( "regexp" "strings" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/vfs" ) // Functions in this file panic on error, but the panic is recovered diff --git a/godoc/util/util.go b/godoc/util/util.go index 1371bcd1..d6416df1 100644 --- a/godoc/util/util.go +++ b/godoc/util/util.go @@ -11,7 +11,7 @@ import ( "time" "unicode/utf8" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/vfs" ) // An RWValue wraps a value and permits mutually exclusive diff --git a/godoc/vfs/gatefs/gatefs.go b/godoc/vfs/gatefs/gatefs.go index 2e6c47f1..cb8ec030 100644 --- a/godoc/vfs/gatefs/gatefs.go +++ b/godoc/vfs/gatefs/gatefs.go @@ -10,7 +10,7 @@ import ( "fmt" "os" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/vfs" ) // New returns a new FileSystem that delegates to fs. diff --git a/godoc/vfs/httpfs/httpfs.go b/godoc/vfs/httpfs/httpfs.go index 51a4fff2..e4beeecf 100644 --- a/godoc/vfs/httpfs/httpfs.go +++ b/godoc/vfs/httpfs/httpfs.go @@ -11,7 +11,7 @@ import ( "net/http" "os" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/vfs" ) func New(fs vfs.FileSystem) http.FileSystem { diff --git a/godoc/vfs/mapfs/mapfs.go b/godoc/vfs/mapfs/mapfs.go index 550c4baf..6da3c0af 100644 --- a/godoc/vfs/mapfs/mapfs.go +++ b/godoc/vfs/mapfs/mapfs.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/vfs" ) // New returns a new FileSystem from the provided map. diff --git a/godoc/vfs/zipfs/zipfs.go b/godoc/vfs/zipfs/zipfs.go index 99869c5a..0e04a4a0 100644 --- a/godoc/vfs/zipfs/zipfs.go +++ b/godoc/vfs/zipfs/zipfs.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "code.google.com/p/go.tools/godoc/vfs" + "golang.org/x/tools/godoc/vfs" ) // zipFI is the zip-file based implementation of FileInfo diff --git a/imports/fix.go b/imports/fix.go index 47a98f9d..11415cfc 100644 --- a/imports/fix.go +++ b/imports/fix.go @@ -16,7 +16,7 @@ import ( "strings" "sync" - "code.google.com/p/go.tools/astutil" + "golang.org/x/tools/astutil" ) // importToGroup is a list of functions which map from an import path to diff --git a/imports/imports.go b/imports/imports.go index 0da153c1..b97529e4 100644 --- a/imports/imports.go +++ b/imports/imports.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "code.google.com/p/go.tools/astutil" + "golang.org/x/tools/astutil" ) // Options specifies options for processing files. diff --git a/oracle/callees.go b/oracle/callees.go index 85844030..c8be7285 100644 --- a/oracle/callees.go +++ b/oracle/callees.go @@ -10,9 +10,9 @@ import ( "go/token" "sort" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" + "golang.org/x/tools/oracle/serial" ) // Callees reports the possible callees of the function call site diff --git a/oracle/callers.go b/oracle/callers.go index f970eb5e..dde803b9 100644 --- a/oracle/callers.go +++ b/oracle/callers.go @@ -8,9 +8,9 @@ import ( "fmt" "go/token" - "code.google.com/p/go.tools/go/callgraph" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/go/callgraph" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/oracle/serial" ) // Callers reports the possible callers of the function diff --git a/oracle/callgraph.go b/oracle/callgraph.go index feda3db9..09f22052 100644 --- a/oracle/callgraph.go +++ b/oracle/callgraph.go @@ -9,10 +9,10 @@ import ( "go/token" "sort" - "code.google.com/p/go.tools/go/callgraph" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/go/callgraph" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" + "golang.org/x/tools/oracle/serial" ) // doCallgraph displays the entire callgraph of the current program, diff --git a/oracle/callstack.go b/oracle/callstack.go index 3269fd27..4b2e3801 100644 --- a/oracle/callstack.go +++ b/oracle/callstack.go @@ -8,9 +8,9 @@ import ( "fmt" "go/token" - "code.google.com/p/go.tools/go/callgraph" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/go/callgraph" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/oracle/serial" ) // Callstack displays an arbitrary path from a root of the callgraph diff --git a/oracle/definition.go b/oracle/definition.go index 16ba5eb3..0f149b2c 100644 --- a/oracle/definition.go +++ b/oracle/definition.go @@ -9,8 +9,8 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/go/types" + "golang.org/x/tools/oracle/serial" ) // definition reports the location of the definition of an identifier. diff --git a/oracle/describe.go b/oracle/describe.go index 8e43407b..0f2ea4b9 100644 --- a/oracle/describe.go +++ b/oracle/describe.go @@ -13,12 +13,12 @@ import ( "os" "strings" - "code.google.com/p/go.tools/astutil" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/go/types/typeutil" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/astutil" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" + "golang.org/x/tools/go/types/typeutil" + "golang.org/x/tools/oracle/serial" ) // describe describes the syntax node denoted by the query position, diff --git a/oracle/freevars.go b/oracle/freevars.go index 5582318f..84a06b00 100644 --- a/oracle/freevars.go +++ b/oracle/freevars.go @@ -11,8 +11,8 @@ import ( "go/token" "sort" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/go/types" + "golang.org/x/tools/oracle/serial" ) // freevars displays the lexical (not package-level) free variables of diff --git a/oracle/implements.go b/oracle/implements.go index 3dcf42ee..d07a02c3 100644 --- a/oracle/implements.go +++ b/oracle/implements.go @@ -12,8 +12,8 @@ import ( "sort" "strings" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/go/types" + "golang.org/x/tools/oracle/serial" ) // Implements displays the "implements" relation as it pertains to the diff --git a/oracle/oracle.go b/oracle/oracle.go index a0d86388..55566c3f 100644 --- a/oracle/oracle.go +++ b/oracle/oracle.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // Package oracle contains the implementation of the oracle tool whose -// command-line is provided by code.google.com/p/go.tools/cmd/oracle. +// command-line is provided by golang.org/x/tools/cmd/oracle. // // http://golang.org/s/oracle-design // http://golang.org/s/oracle-user-manual @@ -56,12 +56,12 @@ import ( "go/token" "io" - "code.google.com/p/go.tools/astutil" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/pointer" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/astutil" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/pointer" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" + "golang.org/x/tools/oracle/serial" ) // An Oracle holds the program state required for one or more queries. diff --git a/oracle/oracle_test.go b/oracle/oracle_test.go index 3bbd23f9..987defea 100644 --- a/oracle/oracle_test.go +++ b/oracle/oracle_test.go @@ -23,7 +23,7 @@ package oracle_test // correctness, since it is critical information.) // // Run this test with: -// % go test code.google.com/p/go.tools/oracle -update +// % go test golang.org/x/tools/oracle -update // to update the golden files. import ( @@ -44,8 +44,8 @@ import ( "strings" "testing" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/oracle" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/oracle" ) var updateFlag = flag.Bool("update", false, "Update the golden files.") diff --git a/oracle/peers.go b/oracle/peers.go index 90baf65d..bcff11c1 100644 --- a/oracle/peers.go +++ b/oracle/peers.go @@ -10,10 +10,10 @@ import ( "go/token" "sort" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/ssa/ssautil" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/ssa/ssautil" + "golang.org/x/tools/go/types" + "golang.org/x/tools/oracle/serial" ) // peers enumerates, for a given channel send (or receive) operation, diff --git a/oracle/pointsto.go b/oracle/pointsto.go index df8d57f7..8f633ad7 100644 --- a/oracle/pointsto.go +++ b/oracle/pointsto.go @@ -10,12 +10,12 @@ import ( "go/token" "sort" - "code.google.com/p/go.tools/astutil" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/pointer" - "code.google.com/p/go.tools/go/ssa" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/astutil" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/pointer" + "golang.org/x/tools/go/ssa" + "golang.org/x/tools/go/types" + "golang.org/x/tools/oracle/serial" ) // pointsto runs the pointer analysis on the selected expression, diff --git a/oracle/pos.go b/oracle/pos.go index 4ae30a6e..6ca019a0 100644 --- a/oracle/pos.go +++ b/oracle/pos.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "code.google.com/p/go.tools/astutil" + "golang.org/x/tools/astutil" ) // parseOctothorpDecimal returns the numeric value if s matches "#%d", diff --git a/oracle/referrers.go b/oracle/referrers.go index 91af9cdb..037b6db0 100644 --- a/oracle/referrers.go +++ b/oracle/referrers.go @@ -10,8 +10,8 @@ import ( "go/token" "sort" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/go/types" + "golang.org/x/tools/oracle/serial" ) // Referrers reports all identifiers that resolve to the same object diff --git a/oracle/what.go b/oracle/what.go index 108bef20..9ffc0673 100644 --- a/oracle/what.go +++ b/oracle/what.go @@ -14,8 +14,8 @@ import ( "sort" "strings" - "code.google.com/p/go.tools/astutil" - "code.google.com/p/go.tools/oracle/serial" + "golang.org/x/tools/astutil" + "golang.org/x/tools/oracle/serial" ) // what reports all the information about the query selection that can be diff --git a/playground/socket/socket.go b/playground/socket/socket.go index 9b446649..fe1ac9ee 100644 --- a/playground/socket/socket.go +++ b/playground/socket/socket.go @@ -35,7 +35,7 @@ import ( "time" "unicode/utf8" - "code.google.com/p/go.net/websocket" + "golang.org/x/net/websocket" ) // RunScripts specifies whether the socket handler should execute shell scripts diff --git a/refactor/README b/refactor/README index a6edb135..a3157845 100644 --- a/refactor/README +++ b/refactor/README @@ -1 +1 @@ -code.google.com/p/go.tools/refactor: libraries for refactoring tools. +golang.org/x/tools/refactor: libraries for refactoring tools. diff --git a/refactor/eg/eg.go b/refactor/eg/eg.go index f080b2ec..933078f0 100644 --- a/refactor/eg/eg.go +++ b/refactor/eg/eg.go @@ -1,5 +1,5 @@ // Package eg implements the example-based refactoring tool whose -// command-line is defined in code.google.com/p/go.tools/cmd/eg. +// command-line is defined in golang.org/x/tools/cmd/eg. package eg import ( @@ -10,8 +10,8 @@ import ( "go/token" "os" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" ) const Help = ` diff --git a/refactor/eg/eg_test.go b/refactor/eg/eg_test.go index dde037b1..6e9fc4ba 100644 --- a/refactor/eg/eg_test.go +++ b/refactor/eg/eg_test.go @@ -12,10 +12,10 @@ import ( "strings" "testing" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/refactor/eg" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" + "golang.org/x/tools/refactor/eg" ) // TODO(adonovan): more tests: diff --git a/refactor/eg/match.go b/refactor/eg/match.go index b1c0cf3c..f5245058 100644 --- a/refactor/eg/match.go +++ b/refactor/eg/match.go @@ -8,9 +8,9 @@ import ( "os" "reflect" - "code.google.com/p/go.tools/go/exact" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/exact" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" ) // matchExpr reports whether pattern x matches y. diff --git a/refactor/eg/rewrite.go b/refactor/eg/rewrite.go index 7e90ee9d..61cfe88b 100644 --- a/refactor/eg/rewrite.go +++ b/refactor/eg/rewrite.go @@ -14,8 +14,8 @@ import ( "strconv" "strings" - "code.google.com/p/go.tools/astutil" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/astutil" + "golang.org/x/tools/go/types" ) // Transform applies the transformation to the specified parsed file, diff --git a/refactor/importgraph/graph.go b/refactor/importgraph/graph.go index bbf88799..bbdbb333 100644 --- a/refactor/importgraph/graph.go +++ b/refactor/importgraph/graph.go @@ -10,7 +10,7 @@ import ( "go/build" "sync" - "code.google.com/p/go.tools/go/buildutil" + "golang.org/x/tools/go/buildutil" ) // A Graph is an import dependency graph, either forward or reverse. diff --git a/refactor/importgraph/graph_test.go b/refactor/importgraph/graph_test.go index 694fbdb6..522e5cbc 100644 --- a/refactor/importgraph/graph_test.go +++ b/refactor/importgraph/graph_test.go @@ -6,12 +6,12 @@ import ( "sort" "testing" - "code.google.com/p/go.tools/refactor/importgraph" + "golang.org/x/tools/refactor/importgraph" _ "crypto/hmac" // just for test, below ) -const this = "code.google.com/p/go.tools/refactor/importgraph" +const this = "golang.org/x/tools/refactor/importgraph" func TestBuild(t *testing.T) { saved := runtime.GOMAXPROCS(8) // Build is highly parallel diff --git a/refactor/lexical/lexical.go b/refactor/lexical/lexical.go index 485aab5f..31dfb0f7 100644 --- a/refactor/lexical/lexical.go +++ b/refactor/lexical/lexical.go @@ -35,7 +35,7 @@ import ( "os" "strconv" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) const trace = false @@ -745,7 +745,7 @@ func Structure(fset *token.FileSet, pkg *types.Package, info *types.Info, files return r.result } -// -- Plundered from code.google.com/p/go.tools/go/ssa ----------------- +// -- Plundered from golang.org/x/tools/go/ssa ----------------- // deref returns a pointer's element type; otherwise it returns typ. func deref(typ types.Type) types.Type { diff --git a/refactor/lexical/lexical_test.go b/refactor/lexical/lexical_test.go index 56feb1d1..ada65956 100644 --- a/refactor/lexical/lexical_test.go +++ b/refactor/lexical/lexical_test.go @@ -8,8 +8,8 @@ import ( "go/build" "testing" - "code.google.com/p/go.tools/go/buildutil" - "code.google.com/p/go.tools/go/loader" + "golang.org/x/tools/go/buildutil" + "golang.org/x/tools/go/loader" ) func TestStdlib(t *testing.T) { @@ -28,8 +28,8 @@ func TestStdlib(t *testing.T) { // Throw in a number of go.tools packages too. pkgs = append(pkgs, - "code.google.com/p/go.tools/cmd/godoc", - "code.google.com/p/go.tools/refactor/lexical") + "golang.org/x/tools/cmd/godoc", + "golang.org/x/tools/refactor/lexical") // Load, parse and type-check the program. conf := loader.Config{ diff --git a/refactor/rename/check.go b/refactor/rename/check.go index 09f5d94d..15741b10 100644 --- a/refactor/rename/check.go +++ b/refactor/rename/check.go @@ -11,10 +11,10 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/refactor/lexical" - "code.google.com/p/go.tools/refactor/satisfy" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" + "golang.org/x/tools/refactor/lexical" + "golang.org/x/tools/refactor/satisfy" ) // errorf reports an error (e.g. conflict) and prevents file modification. @@ -645,7 +645,7 @@ func someUse(info *loader.PackageInfo, obj types.Object) *ast.Ident { return nil } -// -- Plundered from code.google.com/p/go.tools/go/ssa ----------------- +// -- Plundered from golang.org/x/tools/go/ssa ----------------- func isInterface(T types.Type) bool { _, ok := T.Underlying().(*types.Interface) diff --git a/refactor/rename/rename.el b/refactor/rename/rename.el index c31a4653..92683586 100644 --- a/refactor/rename/rename.el +++ b/refactor/rename/rename.el @@ -5,8 +5,8 @@ ;;; Integration of the 'gorename' tool into Emacs. ;;; ;;; To install: -;;; % go get code.google.com/p/go.tools/cmd/gorename -;;; % go build code.google.com/p/go.tools/cmd/gorename +;;; % go get golang.org/x/tools/cmd/gorename +;;; % go build golang.org/x/tools/cmd/gorename ;;; % mv gorename $HOME/bin/ # or elsewhere on $PATH ;;; ;;; The go-rename-command variable can be customized to specify an diff --git a/refactor/rename/rename.go b/refactor/rename/rename.go index 12fc149f..25e1071b 100644 --- a/refactor/rename/rename.go +++ b/refactor/rename/rename.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // Package rename contains the implementation of the 'gorename' command -// whose main function is in code.google.com/p/go.tools/refactor/rename. +// whose main function is in golang.org/x/tools/refactor/rename. // See that package for the command documentation. package rename @@ -20,10 +20,10 @@ import ( "sort" "strings" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/refactor/importgraph" - "code.google.com/p/go.tools/refactor/satisfy" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" + "golang.org/x/tools/refactor/importgraph" + "golang.org/x/tools/refactor/satisfy" ) var ( diff --git a/refactor/rename/spec.go b/refactor/rename/spec.go index dc390f00..571e817b 100644 --- a/refactor/rename/spec.go +++ b/refactor/rename/spec.go @@ -20,9 +20,9 @@ import ( "strconv" "strings" - "code.google.com/p/go.tools/go/buildutil" - "code.google.com/p/go.tools/go/loader" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/buildutil" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/types" ) // A spec specifies an entity to rename. diff --git a/refactor/rename/util.go b/refactor/rename/util.go index 67f48e82..bf9e3504 100644 --- a/refactor/rename/util.go +++ b/refactor/rename/util.go @@ -13,7 +13,7 @@ import ( "strings" "unicode" - "code.google.com/p/go.tools/go/types" + "golang.org/x/tools/go/types" ) func objectKind(obj types.Object) string { @@ -77,7 +77,7 @@ func isDigit(ch rune) bool { return '0' <= ch && ch <= '9' || ch >= 0x80 && unicode.IsDigit(ch) } -// -- Plundered from code.google.com/p/go.tools/oracle ----------------- +// -- Plundered from golang.org/x/tools/oracle ----------------- // sameFile returns true if x and y have the same basename and denote // the same file. diff --git a/refactor/satisfy/find.go b/refactor/satisfy/find.go index 897fbc1c..8671cc58 100644 --- a/refactor/satisfy/find.go +++ b/refactor/satisfy/find.go @@ -49,8 +49,8 @@ import ( "go/ast" "go/token" - "code.google.com/p/go.tools/go/types" - "code.google.com/p/go.tools/go/types/typeutil" + "golang.org/x/tools/go/types" + "golang.org/x/tools/go/types/typeutil" ) // A Constraint records the fact that the RHS type does and must @@ -697,7 +697,7 @@ func (f *Finder) stmt(s ast.Stmt) { } } -// -- Plundered from code.google.com/p/go.tools/go/ssa ----------------- +// -- Plundered from golang.org/x/tools/go/ssa ----------------- // deref returns a pointer's element type; otherwise it returns typ. func deref(typ types.Type) types.Type {