[gopls-release-branch.0.3] all: merge master into gopls-release-branch.0.3

In preparation for gopls/v0.3.3.

Change-Id: Ie25b15b914c7f11c685b068ef1b0b8786e299c92

Author: stamblerre

cmd/benchcmp/benchcmp.go

@@ -32,6 +32,7 @@ benchcmp will also compare memory allocations.
 `
 
 func main() {
+	fmt.Fprintf(os.Stderr, "benchcmp is deprecated in favor of benchstat: https://pkg.go.dev/golang.org/x/perf/cmd/benchstat\n")
 	flag.Usage = func() {
 		fmt.Fprintf(os.Stderr, "usage: %s old.txt new.txt\n\n", os.Args[0])
 		flag.PrintDefaults()

cmd/compilebench/main.go

@@ -246,7 +246,7 @@ func goList(dir string) (*Pkg, error) {
 	var pkg Pkg
 	out, err := exec.Command(*flagGoCmd, "list", "-json", dir).Output()
 	if err != nil {
-		return nil, fmt.Errorf("go list -json %s: %v\n", dir, err)
+		return nil, fmt.Errorf("go list -json %s: %v", dir, err)
 	}
 	if err := json.Unmarshal(out, &pkg); err != nil {
 		return nil, fmt.Errorf("go list -json %s: unmarshal: %v", dir, err)

cmd/digraph/digraph.go

@@ -417,7 +417,7 @@ func digraph(cmd string, args []string) error {
 
 	case "succs", "preds":
 		if len(args) == 0 {
-			return fmt.Errorf("usage: digraph %s <node> ...", cmd)
+			return fmt.Errorf("usage: digraph %s <node> ... ", cmd)
 		}
 		g := g
 		if cmd == "preds" {
@@ -435,7 +435,7 @@ func digraph(cmd string, args []string) error {
 
 	case "forward", "reverse":
 		if len(args) == 0 {
-			return fmt.Errorf("usage: digraph %s <node> ...", cmd)
+			return fmt.Errorf("usage: digraph %s <node> ... ", cmd)
 		}
 		roots := make(nodeset)
 		for _, root := range args {

cmd/fiximports/main.go

@@ -126,7 +126,7 @@ func main() {
 	flag.Parse()
 
 	if len(flag.Args()) == 0 {
-		fmt.Fprintf(stderr, usage)
+		fmt.Fprint(stderr, usage)
 		os.Exit(1)
 	}
 	if !fiximports(flag.Args()...) {

cmd/getgo/main.go

@@ -27,7 +27,7 @@ var (
 	version = "devel"
 )
 
-var exitCleanly error = errors.New("exit cleanly sentinel value")
+var errExitCleanly error = errors.New("exit cleanly sentinel value")
 
 func main() {
 	flag.Parse()
@@ -41,7 +41,7 @@ func main() {
 
 	runStep := func(s step) {
 		err := s(ctx)
-		if err == exitCleanly {
+		if err == errExitCleanly {
 			os.Exit(0)
 		}
 		if err != nil {

cmd/getgo/steps.go

@@ -25,7 +25,7 @@ func welcome(ctx context.Context) error {
 	}
 	if strings.ToLower(answer) != "y" {
 		fmt.Println("Exiting install.")
-		return exitCleanly
+		return errExitCleanly
 	}
 
 	return nil
@@ -65,7 +65,7 @@ func chooseVersion(ctx context.Context) error {
 	if strings.ToLower(answer) != "y" {
 		// TODO: handle passing a version
 		fmt.Println("Aborting install.")
-		return exitCleanly
+		return errExitCleanly
 	}
 
 	return nil
@@ -79,7 +79,7 @@ func downloadGo(ctx context.Context) error {
 
 	if strings.ToLower(answer) != "y" {
 		fmt.Println("Aborting install.")
-		return exitCleanly
+		return errExitCleanly
 	}
 
 	fmt.Printf("Downloading Go version %s to %s\n", *goVersion, installPath)
@@ -105,7 +105,7 @@ func setupGOPATH(ctx context.Context) error {
 
 	if strings.ToLower(answer) != "y" {
 		fmt.Println("Exiting and not setting up GOPATH.")
-		return exitCleanly
+		return errExitCleanly
 	}
 
 	fmt.Println("Setting up GOPATH")

cmd/godex/gc.go

@@ -6,8 +6,11 @@
 
 package main
 
-import "go/importer"
+import (
+	"go/importer"
+	"go/token"
+)
 
 func init() {
-	register("gc", importer.For("gc", nil))
+	register("gc", importer.ForCompiler(token.NewFileSet(), "gc", nil))
 }

cmd/godex/gccgo.go

@@ -8,11 +8,12 @@ package main
 
 import (
 	"go/importer"
+	"go/token"
 	"go/types"
 )
 
 func init() {
-	register("gccgo", importer.For("gccgo", nil))
+	register("gccgo", importer.ForCompiler(token.NewFileSet(), "gccgo", nil))
 }
 
 // Print the extra gccgo compiler data for this package, if it exists.

cmd/godex/godex.go

@@ -23,9 +23,9 @@ var (
 
 // lists of registered sources and corresponding importers
 var (
-	sources      []string
-	importers    []types.Importer
-	importFailed = errors.New("import failed")
+	sources         []string
+	importers       []types.Importer
+	errImportFailed = errors.New("import failed")
 )
 
 func usage() {
@@ -154,7 +154,7 @@ func (p *protector) Import(path string) (pkg *types.Package, err error) {
 	defer func() {
 		if recover() != nil {
 			pkg = nil
-			err = importFailed
+			err = errImportFailed
 		}
 	}()
 	return p.imp.Import(path)

cmd/godex/writetype.go

@@ -133,7 +133,7 @@ func (p *printer) writeTypeInternal(this *types.Package, typ types.Type, visited
 				p.print("\n")
 			}
 			for i, n := 0, t.NumEmbeddeds(); i < n; i++ {
-				typ := t.Embedded(i)
+				typ := t.EmbeddedType(i)
 				p.writeTypeInternal(this, typ, visited)
 				p.print("\n")
 			}