diff --git a/chore/goimp/goimp.go b/chore/goimp/goimp.go index 8bbee021..85590730 100644 --- a/chore/goimp/goimp.go +++ b/chore/goimp/goimp.go @@ -17,12 +17,9 @@ import ( "fmt" "go/importer" "go/token" - "go/types" "os" "path/filepath" "runtime" - - "golang.org/x/tools/go/gcexportdata" ) func main() { @@ -31,13 +28,7 @@ func main() { fmt.Println("GOMODCACHE:", val) var fset = token.NewFileSet() - var imp types.Importer - if true { - imp = importer.ForCompiler(fset, "source", nil) - } else { - packages := make(map[string]*types.Package) - imp = gcexportdata.NewImporter(fset, packages) - } + imp := importer.ForCompiler(fset, "source", nil) _, err := imp.Import("go/types") fmt.Println("Import result:", err) diff --git a/package_test.go b/package_test.go index 754bb5ea..d1bed594 100644 --- a/package_test.go +++ b/package_test.go @@ -32,7 +32,6 @@ import ( "github.com/goplus/gogen" "github.com/goplus/gogen/packages" - "golang.org/x/tools/go/gcexportdata" ) var ( @@ -337,9 +336,7 @@ func bar(v mytype) rune { t.Fatal("parser.ParseFile:", err) } - packages := make(map[string]*types.Package) - imp := gcexportdata.NewImporter(fset, packages) - conf := types.Config{Importer: imp} + conf := types.Config{} pkg, err := conf.Check("foo", fset, []*ast.File{f}, nil) if err != nil { t.Fatal("conf.Check:", err) @@ -381,9 +378,7 @@ func (p *foo) Bar() {} t.Fatal("parser.ParseFile:", err) } - packages := make(map[string]*types.Package) - imp := gcexportdata.NewImporter(fset, packages) - conf := types.Config{Importer: imp} + conf := types.Config{} pkg, err := conf.Check("foo", fset, []*ast.File{f}, nil) if err != nil { t.Fatal("conf.Check:", err)