commit c2d03f470b3e28d9e9eb89e22c8023f2642e802c
author Kirill Smelkov <kirr@nexedi.com> Mon Jul 03 17:18:56 2017 +0300
committer Alan Donovan <adonovan@google.com> Wed Jul 05 16:38:48 2017 +0000
tree 3ed0138f89b0e01020b5d090afe3bd2061b77759
parent 1b3bb8de7d39fe135abc674c1e6d642cce854d4a

go/loader: Fix thinko in FindPackage hook signature

(*build.Context).Import has signature of

	(ctx, importPath, fromDir, mode)

not

	(ctx, fromDir, importPath, mode)

and the loader actually uses the first version.

The thinko was introduced in d6e83e53 (go/loader: changes for vendor
support; CL 18053) and was possible because importPath and fromDir both
have the same type string.

Fix it.

Change-Id: I52deaec6d141846b8a495835b121c1bdc2864215
Reviewed-on: https://go-review.googlesource.com/47343
Reviewed-by: Alan Donovan <adonovan@google.com>

go/loader/loader.go

diff --git a/go/loader/loader.go b/go/loader/loader.go
index 1cd4d6e..de756f7 100644
--- a/go/loader/loader.go
+++ b/go/loader/loader.go
@@ -105,7 +105,7 @@
 	// conventions, for example.
 	//
 	// It must be safe to call concurrently from multiple goroutines.
-	FindPackage func(ctxt *build.Context, fromDir, importPath string, mode build.ImportMode) (*build.Package, error)
+	FindPackage func(ctxt *build.Context, importPath, fromDir string, mode build.ImportMode) (*build.Package, error)
 
 	// AfterTypeCheck is called immediately after a list of files
 	// has been type-checked and appended to info.Files.