remove Importer and importerFn

context.go

@@ -21,19 +21,11 @@ import (
 // enables sh style -e output
 const eMode = false
 
-// Importer resolves package import paths to *importer.Packages.
-type Importer interface {
-
-	// Import attempts to resolve the package import path, path,
-	// to an *importer.Package.
-	Import(path string) (*build.Package, error)
-}
-
 // Context represents an execution of one or more Targets inside a Project.
 type Context struct {
 	Project
 
-	importer Importer
+	importer func(string) (*build.Package, error)
 
 	pkgs map[string]*Package // map of package paths to resolved packages
 
@@ -167,13 +159,11 @@ func NewContext(p Project, opts ...func(*Context) error) (*Context, error) {
 	bc.ReleaseTags = releaseTags
 	bc.BuildTags = ctx.buildtags
 
-	i, err := buildImporter(&bc, &ctx)
+	ctx.importer, err = buildImporter(&bc, &ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	ctx.importer = importerFn(i)
-
 	// C and unsafe are fake packages synthesised by the compiler.
 	// Insert fake packages into the package cache.
 	for _, name := range []string{"C", "unsafe"} {
@@ -252,7 +242,7 @@ func (c *Context) loadPackage(stack []string, path string) (*Package, error) {
 		return pkg, nil
 	}
 
-	p, err := c.importer.Import(path)
+	p, err := c.importer(path)
 	if err != nil {
 		return nil, err
 	}

context_test.go

@@ -232,7 +232,7 @@ func TestContextImportPackage(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		_, err = ctx.importer.Import(tt.path)
+		_, err = ctx.importer(tt.path)
 		if !reflect.DeepEqual(err, tt.err) {
 			t.Errorf("importPackage(%q): got %v, want %v", tt.path, err, tt.err)
 		}

resolver.go

@@ -18,12 +18,6 @@ func nullImporter() func(string) (*build.Package, error) {
 	}
 }
 
-type importerFn func(string) (*build.Package, error)
-
-func (fn importerFn) Import(path string) (*build.Package, error) {
-	return fn(path)
-}
-
 func srcImporter(parent, child func(string) (*build.Package, error)) func(string) (*build.Package, error) {
 	return func(path string) (*build.Package, error) {
 		pkg, err := child(path)