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
diff --git a/go/buildutil/allpackages_test.go b/go/buildutil/allpackages_test.go
index ee741d9..552ad6c 100644
--- a/go/buildutil/allpackages_test.go
+++ b/go/buildutil/allpackages_test.go
@@ -8,7 +8,7 @@
"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 @@
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 f0db26c..f156829 100644
--- a/go/buildutil/util_test.go
+++ b/go/buildutil/util_test.go
@@ -11,7 +11,7 @@
"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 @@
{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 68ed230..d0e12d8 100644
--- a/go/callgraph/callgraph.go
+++ b/go/callgraph/callgraph.go
@@ -43,7 +43,7 @@
"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 2532fd8..a8f8903 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 266fbac..1c56cf5 100644
--- a/go/gccgoimporter/gccgoinstallation.go
+++ b/go/gccgoimporter/gccgoinstallation.go
@@ -11,7 +11,7 @@
"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 64c9890..9ab928d 100644
--- a/go/gccgoimporter/gccgoinstallation_test.go
+++ b/go/gccgoimporter/gccgoinstallation_test.go
@@ -8,7 +8,7 @@
"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 dc02383..a2b772b 100644
--- a/go/gccgoimporter/importer.go
+++ b/go/gccgoimporter/importer.go
@@ -16,8 +16,8 @@
"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 2276768..722151f 100644
--- a/go/gccgoimporter/importer_test.go
+++ b/go/gccgoimporter/importer_test.go
@@ -12,7 +12,7 @@
"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 6c4faf6..883c350 100644
--- a/go/gccgoimporter/parser.go
+++ b/go/gccgoimporter/parser.go
@@ -14,8 +14,8 @@
"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 f084a63..1f0f12a 100644
--- a/go/gccgoimporter/parser_test.go
+++ b/go/gccgoimporter/parser_test.go
@@ -10,7 +10,7 @@
"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 f0e0412..b6844b4 100644
--- a/go/gcimporter/gcimporter.go
+++ b/go/gcimporter/gcimporter.go
@@ -19,8 +19,8 @@
"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 877489b..a20853a 100644
--- a/go/gcimporter/gcimporter_test.go
+++ b/go/gcimporter/gcimporter_test.go
@@ -15,7 +15,7 @@
"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 9579963..5930eaf 100644
--- a/go/importer/export.go
+++ b/go/importer/export.go
@@ -11,8 +11,8 @@
"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 16c6eba..3604c98 100644
--- a/go/importer/import.go
+++ b/go/importer/import.go
@@ -14,8 +14,8 @@
"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 d21ad7e..3a2560c 100644
--- a/go/importer/import_test.go
+++ b/go/importer/import_test.go
@@ -20,8 +20,8 @@
"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 3965b0a..a4db568 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 f64b3b6..566108f 100644
--- a/go/loader/loader.go
+++ b/go/loader/loader.go
@@ -136,9 +136,9 @@
"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 0421ec0..c239c63 100644
--- a/go/loader/loader_test.go
+++ b/go/loader/loader_test.go
@@ -16,7 +16,7 @@
"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 919237d..d0ca4a7 100644
--- a/go/loader/source_test.go
+++ b/go/loader/source_test.go
@@ -13,9 +13,9 @@
"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 6994264..eb439a1 100644
--- a/go/loader/stdlib_test.go
+++ b/go/loader/stdlib_test.go
@@ -23,9 +23,9 @@
"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 bc68795..8887a86 100644
--- a/go/pointer/analysis.go
+++ b/go/pointer/analysis.go
@@ -16,10 +16,10 @@
"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 890017a..a81c586 100644
--- a/go/pointer/api.go
+++ b/go/pointer/api.go
@@ -10,10 +10,10 @@
"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 6706291..48e152e 100644
--- a/go/pointer/callgraph.go
+++ b/go/pointer/callgraph.go
@@ -10,7 +10,7 @@
"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 0f363b9..e6371cc 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 3606ed6..eecfd30 100644
--- a/go/pointer/example_test.go
+++ b/go/pointer/example_test.go
@@ -8,10 +8,10 @@
"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 cfd8241..12f4d79 100644
--- a/go/pointer/gen.go
+++ b/go/pointer/gen.go
@@ -14,9 +14,9 @@
"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 0e1c6b2..a3ef1f3 100644
--- a/go/pointer/hvn.go
+++ b/go/pointer/hvn.go
@@ -162,8 +162,8 @@
"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 cb0100e..251c0e2 100644
--- a/go/pointer/intrinsics.go
+++ b/go/pointer/intrinsics.go
@@ -18,8 +18,8 @@
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 48a9f0b..cf6ef20 100644
--- a/go/pointer/labels.go
+++ b/go/pointer/labels.go
@@ -9,8 +9,8 @@
"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 7c10693..aeffb5c 100644
--- a/go/pointer/pointer_test.go
+++ b/go/pointer/pointer_test.go
@@ -21,13 +21,13 @@
"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 6e5c54c..7e9c280 100644
--- a/go/pointer/reflect.go
+++ b/go/pointer/reflect.go
@@ -28,9 +28,9 @@
"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 ce5d07c..ad1a65f 100644
--- a/go/pointer/solve.go
+++ b/go/pointer/solve.go
@@ -10,7 +10,7 @@
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 c5869ec..214cdfc 100644
--- a/go/pointer/stdlib_test.go
+++ b/go/pointer/stdlib_test.go
@@ -10,7 +10,7 @@
//
// 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 @@
"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 e3ac4fc..88bada8 100644
--- a/go/pointer/util.go
+++ b/go/pointer/util.go
@@ -13,8 +13,8 @@
"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 e45bffa..6e1739c 100644
--- a/go/ssa/builder.go
+++ b/go/ssa/builder.go
@@ -37,8 +37,8 @@
"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 1df98b5..858db4b 100644
--- a/go/ssa/builder_test.go
+++ b/go/ssa/builder_test.go
@@ -11,9 +11,9 @@
"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 44a1ee7..304096e 100644
--- a/go/ssa/const.go
+++ b/go/ssa/const.go
@@ -11,8 +11,8 @@
"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 7a3629e..7f57101 100644
--- a/go/ssa/create.go
+++ b/go/ssa/create.go
@@ -13,8 +13,8 @@
"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 0963d4f..84246c6 100644
--- a/go/ssa/emit.go
+++ b/go/ssa/emit.go
@@ -11,7 +11,7 @@
"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 f78ce63..5253c88 100644
--- a/go/ssa/example_test.go
+++ b/go/ssa/example_test.go
@@ -8,8 +8,8 @@
"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 @@
//
// 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 52c4991..3f08d3e 100644
--- a/go/ssa/func.go
+++ b/go/ssa/func.go
@@ -15,7 +15,7 @@
"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 26a39da..e3a8ee0 100644
--- a/go/ssa/interp/external.go
+++ b/go/ssa/interp/external.go
@@ -15,8 +15,8 @@
"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 80c620c..d674c25 100644
--- a/go/ssa/interp/interp.go
+++ b/go/ssa/interp/interp.go
@@ -51,8 +51,8 @@
"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 a732960..456fdaf 100644
--- a/go/ssa/interp/interp_test.go
+++ b/go/ssa/interp/interp_test.go
@@ -16,10 +16,10 @@
"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 @@
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 @@
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 5e93e7f..5dbaf0a 100644
--- a/go/ssa/interp/map.go
+++ b/go/ssa/interp/map.go
@@ -12,7 +12,7 @@
// 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 b1fca00..fe7d679 100644
--- a/go/ssa/interp/ops.go
+++ b/go/ssa/interp/ops.go
@@ -12,9 +12,9 @@
"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 91a0b30..051695c 100644
--- a/go/ssa/interp/reflect.go
+++ b/go/ssa/interp/reflect.go
@@ -16,8 +16,8 @@
"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 f3257b9..a8d27ee 100644
--- a/go/ssa/interp/value.go
+++ b/go/ssa/interp/value.go
@@ -42,9 +42,9 @@
"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 1f190fe..3771f61 100644
--- a/go/ssa/lift.go
+++ b/go/ssa/lift.go
@@ -47,7 +47,7 @@
"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 2e8eb9d..e58bc24 100644
--- a/go/ssa/lvalue.go
+++ b/go/ssa/lvalue.go
@@ -11,7 +11,7 @@
"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 322c885..1ef725c 100644
--- a/go/ssa/methods.go
+++ b/go/ssa/methods.go
@@ -9,7 +9,7 @@
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 f9b3d17..9fda3a4 100644
--- a/go/ssa/print.go
+++ b/go/ssa/print.go
@@ -14,8 +14,8 @@
"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 69d80e2..3fd6747 100644
--- a/go/ssa/sanity.go
+++ b/go/ssa/sanity.go
@@ -13,7 +13,7 @@
"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 8f0d0f3..02b0260 100644
--- a/go/ssa/source.go
+++ b/go/ssa/source.go
@@ -14,7 +14,7 @@
"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 0fa68d8..203da7f 100644
--- a/go/ssa/source_test.go
+++ b/go/ssa/source_test.go
@@ -16,11 +16,11 @@
"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 09fa75f..8543992 100644
--- a/go/ssa/ssa.go
+++ b/go/ssa/ssa.go
@@ -13,10 +13,10 @@
"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 ae030c4..70fff9c 100644
--- a/go/ssa/ssautil/switch.go
+++ b/go/ssa/ssautil/switch.go
@@ -23,8 +23,8 @@
"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 86d5bfb..ae11058 100644
--- a/go/ssa/ssautil/switch_test.go
+++ b/go/ssa/ssautil/switch_test.go
@@ -9,9 +9,9 @@
"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 6b8c5d2..8dc6694 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 bfe7216..c45923b 100644
--- a/go/ssa/stdlib_test.go
+++ b/go/ssa/stdlib_test.go
@@ -16,10 +16,10 @@
"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 f11e3b7..422c7db 100644
--- a/go/ssa/testmain.go
+++ b/go/ssa/testmain.go
@@ -14,7 +14,7 @@
"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 3a9eacc..04a41fc 100644
--- a/go/ssa/testmain_test.go
+++ b/go/ssa/testmain_test.go
@@ -12,8 +12,8 @@
"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 738ac7b..1cf15e8 100644
--- a/go/ssa/util.go
+++ b/go/ssa/util.go
@@ -13,7 +13,7 @@
"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 d23075f..10c8a64 100644
--- a/go/ssa/wrappers.go
+++ b/go/ssa/wrappers.go
@@ -22,7 +22,7 @@
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 1bb8934..908b0f0 100644
--- a/go/types/api.go
+++ b/go/types/api.go
@@ -28,7 +28,7 @@
"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 @@
// 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 9b698a1..ad3d30b 100644
--- a/go/types/api_test.go
+++ b/go/types/api_test.go
@@ -13,8 +13,8 @@
"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 33d7ca3..fc0b7f7 100644
--- a/go/types/builtins.go
+++ b/go/types/builtins.go
@@ -10,7 +10,7 @@
"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 9164cf3..e785799 100644
--- a/go/types/builtins_test.go
+++ b/go/types/builtins_test.go
@@ -10,8 +10,8 @@
"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 4c21984..5b30a30 100644
--- a/go/types/check.go
+++ b/go/types/check.go
@@ -10,7 +10,7 @@
"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 dddae30..aefaa5a 100644
--- a/go/types/check_test.go
+++ b/go/types/check_test.go
@@ -36,8 +36,8 @@
"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 e951887..32cc822 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 f0d0760..3273fd4 100644
--- a/go/types/decl.go
+++ b/go/types/decl.go
@@ -8,7 +8,7 @@
"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 549aadb..3edb385 100644
--- a/go/types/eval.go
+++ b/go/types/eval.go
@@ -12,7 +12,7 @@
"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 d9b6852..14d3327 100644
--- a/go/types/eval_test.go
+++ b/go/types/eval_test.go
@@ -13,8 +13,8 @@
"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 cda473f..c55ce6a 100644
--- a/go/types/expr.go
+++ b/go/types/expr.go
@@ -12,7 +12,7 @@
"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 8606715..cfd1472 100644
--- a/go/types/exprstring_test.go
+++ b/go/types/exprstring_test.go
@@ -8,7 +8,7 @@
"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 298d1ca..b555721 100644
--- a/go/types/hilbert_test.go
+++ b/go/types/hilbert_test.go
@@ -14,7 +14,7 @@
"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 95c6f67..04d8b37 100644
--- a/go/types/issues_test.go
+++ b/go/types/issues_test.go
@@ -14,8 +14,8 @@
"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 37b3fc4..30bc31a 100644
--- a/go/types/object.go
+++ b/go/types/object.go
@@ -10,7 +10,7 @@
"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 2545da7..7418eef 100644
--- a/go/types/operand.go
+++ b/go/types/operand.go
@@ -11,7 +11,7 @@
"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 690c44f..e8b2823 100644
--- a/go/types/resolver.go
+++ b/go/types/resolver.go
@@ -14,7 +14,7 @@
"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 @@
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 9fc9893..d8af7a0 100644
--- a/go/types/resolver_test.go
+++ b/go/types/resolver_test.go
@@ -12,8 +12,8 @@
"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 e7342de..01d12c7 100644
--- a/go/types/self_test.go
+++ b/go/types/self_test.go
@@ -14,8 +14,8 @@
"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 310e11d..8629022 100644
--- a/go/types/stdlib_test.go
+++ b/go/types/stdlib_test.go
@@ -22,8 +22,8 @@
"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 9b96436..42580bd 100644
--- a/go/types/stmt.go
+++ b/go/types/stmt.go
@@ -11,7 +11,7 @@
"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 b003cbb..9aacf85 100644
--- a/go/types/typestring_test.go
+++ b/go/types/typestring_test.go
@@ -10,8 +10,8 @@
"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 = "<src>"
diff --git a/go/types/typeutil/imports.go b/go/types/typeutil/imports.go
index b7b8f4f..0f4a232 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 aca6c1a..6f207cf 100644
--- a/go/types/typeutil/imports_test.go
+++ b/go/types/typeutil/imports_test.go
@@ -7,8 +7,8 @@
"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 69c3f13..bf1ed2d 100644
--- a/go/types/typeutil/map.go
+++ b/go/types/typeutil/map.go
@@ -11,7 +11,7 @@
"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 9d2a788..776b5e2 100644
--- a/go/types/typeutil/map_test.go
+++ b/go/types/typeutil/map_test.go
@@ -12,8 +12,8 @@
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 a17c1a4..af42d2d 100644
--- a/go/types/typeutil/ui.go
+++ b/go/types/typeutil/ui.go
@@ -6,7 +6,7 @@
// 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 d9a4f20..8c4b679 100644
--- a/go/types/typexpr.go
+++ b/go/types/typexpr.go
@@ -12,7 +12,7 @@
"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 1494db0..420f938 100644
--- a/go/types/universe.go
+++ b/go/types/universe.go
@@ -10,7 +10,7 @@
"go/token"
"strings"
- "code.google.com/p/go.tools/go/exact"
+ "golang.org/x/tools/go/exact"
)
var (
