astutil: move to go/ast/astutil

Change-Id: I9a45bfc07613eb2210081d306d71f0a4d152eda5
Reviewed-on: https://go-review.googlesource.com/2592
Reviewed-by: Alan Donovan <adonovan@google.com>
This commit is contained in:
Peter Collingbourne 2015-01-08 18:32:51 -08:00 committed by Alan Donovan
parent 230eaff9cf
commit 4f8578d2c0
23 changed files with 22 additions and 22 deletions

View File

@ -10,7 +10,7 @@ import (
"go/ast" "go/ast"
"go/token" "go/token"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
) )
func init() { func init() {

View File

@ -18,7 +18,7 @@ import (
"strings" "strings"
"testing" "testing"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
) )
// pathToString returns a string containing the concrete types of the // pathToString returns a string containing the concrete types of the

View File

@ -3,7 +3,7 @@
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// Package astutil contains common utilities for working with the Go AST. // 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 ( import (
"fmt" "fmt"

View File

@ -364,12 +364,12 @@ import (
type I int type I int
`) `)
// The AddImport order here matters. // 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") AddImport(fset, file, "os")
want := `package main want := `package main
import ( import (
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"os" "os"
) )

View File

@ -136,7 +136,7 @@ import (
"os" "os"
"strings" "strings"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/gcimporter" "golang.org/x/tools/go/gcimporter"
"golang.org/x/tools/go/types" "golang.org/x/tools/go/types"
) )

View File

@ -13,7 +13,7 @@ import (
"strings" "strings"
"testing" "testing"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/loader" "golang.org/x/tools/go/loader"
"golang.org/x/tools/go/ssa" "golang.org/x/tools/go/ssa"
) )

View File

@ -16,7 +16,7 @@ import (
"strings" "strings"
"testing" "testing"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/exact" "golang.org/x/tools/go/exact"
"golang.org/x/tools/go/loader" "golang.org/x/tools/go/loader"
"golang.org/x/tools/go/ssa" "golang.org/x/tools/go/ssa"

View File

@ -13,7 +13,7 @@ import (
"io" "io"
"os" "os"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/types" "golang.org/x/tools/go/types"
) )

View File

@ -10,7 +10,7 @@ import (
"go/ast" "go/ast"
"go/token" "go/token"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/exact" "golang.org/x/tools/go/exact"
) )

View File

@ -16,7 +16,7 @@ import (
"strings" "strings"
"sync" "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 // importToGroup is a list of functions which map from an import path to

View File

@ -20,7 +20,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
) )
// Options specifies options for processing files. // Options specifies options for processing files.

View File

@ -13,7 +13,7 @@ import (
"os" "os"
"strings" "strings"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/exact" "golang.org/x/tools/go/exact"
"golang.org/x/tools/go/loader" "golang.org/x/tools/go/loader"
"golang.org/x/tools/go/types" "golang.org/x/tools/go/types"

View File

@ -56,7 +56,7 @@ import (
"go/token" "go/token"
"io" "io"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/loader" "golang.org/x/tools/go/loader"
"golang.org/x/tools/go/pointer" "golang.org/x/tools/go/pointer"
"golang.org/x/tools/go/ssa" "golang.org/x/tools/go/ssa"

View File

@ -10,7 +10,7 @@ import (
"go/token" "go/token"
"sort" "sort"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/loader" "golang.org/x/tools/go/loader"
"golang.org/x/tools/go/pointer" "golang.org/x/tools/go/pointer"
"golang.org/x/tools/go/ssa" "golang.org/x/tools/go/ssa"

View File

@ -11,7 +11,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
) )
// parseOctothorpDecimal returns the numeric value if s matches "#%d", // parseOctothorpDecimal returns the numeric value if s matches "#%d",

View File

@ -14,7 +14,7 @@ import (
"sort" "sort"
"strings" "strings"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/oracle/serial" "golang.org/x/tools/oracle/serial"
) )

View File

@ -10,7 +10,7 @@ import (
"go/token" "go/token"
"sort" "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"
"golang.org/x/tools/go/ssa/ssautil" "golang.org/x/tools/go/ssa/ssautil"
"golang.org/x/tools/go/types" "golang.org/x/tools/go/types"

View File

@ -8,7 +8,7 @@ import (
"os" "os"
"reflect" "reflect"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/exact" "golang.org/x/tools/go/exact"
"golang.org/x/tools/go/loader" "golang.org/x/tools/go/loader"
"golang.org/x/tools/go/types" "golang.org/x/tools/go/types"

View File

@ -14,7 +14,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/types" "golang.org/x/tools/go/types"
) )

View File

@ -13,7 +13,7 @@ import (
"strings" "strings"
"unicode" "unicode"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/types" "golang.org/x/tools/go/types"
) )

View File

@ -49,7 +49,7 @@ import (
"go/ast" "go/ast"
"go/token" "go/token"
"golang.org/x/tools/astutil" "golang.org/x/tools/go/ast/astutil"
"golang.org/x/tools/go/types" "golang.org/x/tools/go/types"
) )