Skip to content

Commit a1dca8a

Browse files
committed
remove golang.org/x/tools/go/gcexportdata
1 parent 1af35fa commit a1dca8a

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

chore/goimp/goimp.go

+1-10
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@ import (
1717
"fmt"
1818
"go/importer"
1919
"go/token"
20-
"go/types"
2120
"os"
2221
"path/filepath"
2322
"runtime"
24-
25-
"golang.org/x/tools/go/gcexportdata"
2623
)
2724

2825
func main() {
@@ -31,13 +28,7 @@ func main() {
3128
fmt.Println("GOMODCACHE:", val)
3229

3330
var fset = token.NewFileSet()
34-
var imp types.Importer
35-
if true {
36-
imp = importer.ForCompiler(fset, "source", nil)
37-
} else {
38-
packages := make(map[string]*types.Package)
39-
imp = gcexportdata.NewImporter(fset, packages)
40-
}
31+
imp := importer.ForCompiler(fset, "source", nil)
4132

4233
_, err := imp.Import("go/types")
4334
fmt.Println("Import result:", err)

package_test.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232

3333
"github.com/goplus/gogen"
3434
"github.com/goplus/gogen/packages"
35-
"golang.org/x/tools/go/gcexportdata"
3635
)
3736

3837
var (
@@ -337,9 +336,7 @@ func bar(v mytype) rune {
337336
t.Fatal("parser.ParseFile:", err)
338337
}
339338

340-
packages := make(map[string]*types.Package)
341-
imp := gcexportdata.NewImporter(fset, packages)
342-
conf := types.Config{Importer: imp}
339+
conf := types.Config{}
343340
pkg, err := conf.Check("foo", fset, []*ast.File{f}, nil)
344341
if err != nil {
345342
t.Fatal("conf.Check:", err)
@@ -381,9 +378,7 @@ func (p *foo) Bar() {}
381378
t.Fatal("parser.ParseFile:", err)
382379
}
383380

384-
packages := make(map[string]*types.Package)
385-
imp := gcexportdata.NewImporter(fset, packages)
386-
conf := types.Config{Importer: imp}
381+
conf := types.Config{}
387382
pkg, err := conf.Check("foo", fset, []*ast.File{f}, nil)
388383
if err != nil {
389384
t.Fatal("conf.Check:", err)

0 commit comments

Comments
 (0)