diff --git a/cmd/vet/bool.go b/cmd/vet/bool.go index 257c5c6f3c..37aac68e82 100644 --- a/cmd/vet/bool.go +++ b/cmd/vet/bool.go @@ -10,7 +10,7 @@ import ( "go/ast" "go/token" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" ) func init() { diff --git a/astutil/enclosing.go b/go/ast/astutil/enclosing.go similarity index 100% rename from astutil/enclosing.go rename to go/ast/astutil/enclosing.go diff --git a/astutil/enclosing_test.go b/go/ast/astutil/enclosing_test.go similarity index 99% rename from astutil/enclosing_test.go rename to go/ast/astutil/enclosing_test.go index ace6974aad..107f87c55c 100644 --- a/astutil/enclosing_test.go +++ b/go/ast/astutil/enclosing_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" ) // pathToString returns a string containing the concrete types of the diff --git a/astutil/imports.go b/go/ast/astutil/imports.go similarity index 99% rename from astutil/imports.go rename to go/ast/astutil/imports.go index 7679b1ffa9..29f52de6af 100644 --- a/astutil/imports.go +++ b/go/ast/astutil/imports.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // Package astutil contains common utilities for working with the Go AST. -package astutil // import "golang.org/x/tools/astutil" +package astutil // import "golang.org/x/tools/go/ast/astutil" import ( "fmt" diff --git a/astutil/imports_test.go b/go/ast/astutil/imports_test.go similarity index 99% rename from astutil/imports_test.go rename to go/ast/astutil/imports_test.go index 74ded43fa7..6bc940c663 100644 --- a/astutil/imports_test.go +++ b/go/ast/astutil/imports_test.go @@ -364,12 +364,12 @@ import ( type I int `) // The AddImport order here matters. - AddImport(fset, file, "golang.org/x/tools/astutil") + AddImport(fset, file, "golang.org/x/tools/go/ast/astutil") AddImport(fset, file, "os") want := `package main import ( - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "os" ) diff --git a/astutil/util.go b/go/ast/astutil/util.go similarity index 100% rename from astutil/util.go rename to go/ast/astutil/util.go diff --git a/go/loader/loader.go b/go/loader/loader.go index c568ea2fd2..ad7e14de4b 100644 --- a/go/loader/loader.go +++ b/go/loader/loader.go @@ -136,7 +136,7 @@ import ( "os" "strings" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/gcimporter" "golang.org/x/tools/go/types" ) diff --git a/go/loader/source_test.go b/go/loader/source_test.go index d0ca4a751e..f2e06be598 100644 --- a/go/loader/source_test.go +++ b/go/loader/source_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/loader" "golang.org/x/tools/go/ssa" ) diff --git a/go/ssa/source_test.go b/go/ssa/source_test.go index 203da7f3ab..68b5401c28 100644 --- a/go/ssa/source_test.go +++ b/go/ssa/source_test.go @@ -16,7 +16,7 @@ import ( "strings" "testing" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/exact" "golang.org/x/tools/go/loader" "golang.org/x/tools/go/ssa" diff --git a/go/ssa/util.go b/go/ssa/util.go index 58f4e8d849..cd476d860d 100644 --- a/go/ssa/util.go +++ b/go/ssa/util.go @@ -13,7 +13,7 @@ import ( "io" "os" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/types" ) diff --git a/go/types/builtins.go b/go/types/builtins.go index 8447f0b6fd..f3e885513d 100644 --- a/go/types/builtins.go +++ b/go/types/builtins.go @@ -10,7 +10,7 @@ import ( "go/ast" "go/token" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/exact" ) diff --git a/imports/fix.go b/imports/fix.go index 6f441aaa44..22fde6c1f0 100644 --- a/imports/fix.go +++ b/imports/fix.go @@ -16,7 +16,7 @@ import ( "strings" "sync" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/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 c521ae8c47..e30946bc63 100644 --- a/imports/imports.go +++ b/imports/imports.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" ) // Options specifies options for processing files. diff --git a/oracle/describe.go b/oracle/describe.go index 01b245c44c..1c329d01c2 100644 --- a/oracle/describe.go +++ b/oracle/describe.go @@ -13,7 +13,7 @@ import ( "os" "strings" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/exact" "golang.org/x/tools/go/loader" "golang.org/x/tools/go/types" diff --git a/oracle/oracle.go b/oracle/oracle.go index e97d76e560..60cc2be5c7 100644 --- a/oracle/oracle.go +++ b/oracle/oracle.go @@ -56,7 +56,7 @@ import ( "go/token" "io" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/loader" "golang.org/x/tools/go/pointer" "golang.org/x/tools/go/ssa" diff --git a/oracle/pointsto.go b/oracle/pointsto.go index 8f633ad794..10ad06951c 100644 --- a/oracle/pointsto.go +++ b/oracle/pointsto.go @@ -10,7 +10,7 @@ import ( "go/token" "sort" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/loader" "golang.org/x/tools/go/pointer" "golang.org/x/tools/go/ssa" diff --git a/oracle/pos.go b/oracle/pos.go index 6ca019a056..d5d558b39c 100644 --- a/oracle/pos.go +++ b/oracle/pos.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" ) // parseOctothorpDecimal returns the numeric value if s matches "#%d", diff --git a/oracle/what.go b/oracle/what.go index 9ffc0673b6..c1053f48e6 100644 --- a/oracle/what.go +++ b/oracle/what.go @@ -14,7 +14,7 @@ import ( "sort" "strings" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/oracle/serial" ) diff --git a/oracle/whicherrs.go b/oracle/whicherrs.go index 9ffe2ac334..a73aa8d1c3 100644 --- a/oracle/whicherrs.go +++ b/oracle/whicherrs.go @@ -10,7 +10,7 @@ import ( "go/token" "sort" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/ssa" "golang.org/x/tools/go/ssa/ssautil" "golang.org/x/tools/go/types" diff --git a/refactor/eg/match.go b/refactor/eg/match.go index 6c1df4b8bf..298a258f31 100644 --- a/refactor/eg/match.go +++ b/refactor/eg/match.go @@ -8,7 +8,7 @@ import ( "os" "reflect" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/exact" "golang.org/x/tools/go/loader" "golang.org/x/tools/go/types" diff --git a/refactor/eg/rewrite.go b/refactor/eg/rewrite.go index 61cfe88b9e..db9c693b6f 100644 --- a/refactor/eg/rewrite.go +++ b/refactor/eg/rewrite.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/types" ) diff --git a/refactor/rename/util.go b/refactor/rename/util.go index 8f3c62ae54..def93995a6 100644 --- a/refactor/rename/util.go +++ b/refactor/rename/util.go @@ -13,7 +13,7 @@ import ( "strings" "unicode" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/types" ) diff --git a/refactor/satisfy/find.go b/refactor/satisfy/find.go index 2af37f1e87..9770a02b1c 100644 --- a/refactor/satisfy/find.go +++ b/refactor/satisfy/find.go @@ -49,7 +49,7 @@ import ( "go/ast" "go/token" - "golang.org/x/tools/astutil" + "golang.org/x/tools/go/ast/astutil" "golang.org/x/tools/go/types" )