fix conflict

Author: komem3

README.md

@@ -2,37 +2,94 @@
 
 [![PkgGoDev](https://pkg.go.dev/badge/golang.org/x/tools)](https://pkg.go.dev/golang.org/x/tools)
 
-This subrepository holds the source for various packages and tools that support
-the Go programming language.
+This repository provides the `golang.org/x/tools` module, comprising
+various tools and packages mostly for static analysis of Go programs,
+some of which are listed below.
+Use the "Go reference" link above for more information about any package.
 
-Some of the tools, `godoc` and `vet` for example, are included in binary Go
-distributions.
+It also contains the
+[`golang.org/x/tools/gopls`](https://pkg.go.dev/golang.org/x/tools/gopls)
+module, whose root package is a language-server protocol (LSP) server for Go.
+An LSP server analyses the source code of a project and
+responds to requests from a wide range of editors such as VSCode and
+Vim, allowing them to support IDE-like functionality.
 
-Others, including the Go `guru` and the test coverage tool, can be fetched with
-`go get`.
+<!-- List only packages of general interest below. -->
 
-Packages include a type-checker for Go and an implementation of the
-Static Single Assignment form (SSA) representation for Go programs.
+Selected commands:
 
-## Download/Install
+- `cmd/goimports` formats a Go program like `go fmt` and additionally
+  inserts import statements for any packages required by the file
+  after it is edited.
+- `cmd/callgraph` prints the call graph of a Go program.
+- `cmd/digraph` is a utility for manipulating directed graphs in textual notation.
+- `cmd/stringer` generates declarations (including a `String` method) for "enum" types.
+- `cmd/toolstash` is a utility to simplify working with multiple versions of the Go toolchain.
 
-The easiest way to install is to run `go get -u golang.org/x/tools/...`. You can
-also manually git clone the repository to `$GOPATH/src/golang.org/x/tools`.
+These commands may be fetched with a command such as
+`go install golang.org/x/tools/cmd/goimports@latest`.
 
-## JS/CSS Formatting
+Selected packages:
 
-This repository uses [prettier](https://prettier.io/) to format JS and CSS files.
+- `go/ssa` provides a static single-assignment form (SSA) intermediate
+  representation (IR) for Go programs, similar to a typical compiler,
+  for use by analysis tools.
 
-The version of `prettier` used is 1.18.2.
+- `go/packages` provides a simple interface for loading, parsing, and
+  type checking a complete Go program from source code.
 
-It is encouraged that all JS and CSS code be run through this before submitting
-a change. However, it is not a strict requirement enforced by CI.
+- `go/analysis` provides a framework for modular static analysis of Go
+  programs.
+
+- `go/callgraph` provides call graphs of Go programs using a variety
+  of algorithms with different trade-offs.
+
+- `go/ast/inspector` provides an optimized means of traversing a Go
+  parse tree for use in analysis tools.
+
+- `go/cfg` provides a simple control-flow graph (CFG) for a Go function.
+
+- `go/expect` reads Go source files used as test inputs and interprets
+  special comments within them as queries or assertions for testing.
+
+- `go/gcexportdata` and `go/gccgoexportdata` read and write the binary
+  files containing type information used by the standard and `gccgo` compilers.
+
+- `go/types/objectpath` provides a stable naming scheme for named
+  entities ("objects") in the `go/types` API.
+
+Numerous other packages provide more esoteric functionality.
 
-## Report Issues / Send Patches
+<!-- Some that didn't make the cut: 
 
-This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://golang.org/doc/contribute.html.
+golang.org/x/tools/benchmark/parse
+golang.org/x/tools/go/ast/astutil
+golang.org/x/tools/go/types/typeutil
+golang.org/x/tools/go/vcs
+golang.org/x/tools/godoc
+golang.org/x/tools/playground
+golang.org/x/tools/present
+golang.org/x/tools/refactor/importgraph
+golang.org/x/tools/refactor/rename
+golang.org/x/tools/refactor/satisfy
+golang.org/x/tools/txtar
+
+-->
+
+## Contributing
+
+This repository uses Gerrit for code changes.
+To learn how to submit changes, see https://golang.org/doc/contribute.html.
 
 The main issue tracker for the tools repository is located at
 https://github.com/golang/go/issues. Prefix your issue with "x/tools/(your
 subdir):" in the subject line, so it is easy to find.
+
+### JavaScript and CSS Formatting
+
+This repository uses [prettier](https://prettier.io/) to format JS and CSS files.
+
+The version of `prettier` used is 1.18.2.
+
+It is encouraged that all JS and CSS code be run through this before submitting
+a change. However, it is not a strict requirement enforced by CI.

cmd/auth/cookieauth/cookieauth.go

@@ -7,7 +7,8 @@
 // It expects the location of the file as the first command-line argument.
 //
 // Example GOAUTH usage:
-// 	export GOAUTH="cookieauth $(git config --get http.cookieFile)"
+//
+//	export GOAUTH="cookieauth $(git config --get http.cookieFile)"
 //
 // See http://www.cookiecentral.com/faq/#3.5 for a description of the Netscape
 // cookie file format.

cmd/auth/gitauth/gitauth.go

@@ -7,7 +7,8 @@
 // directory for the 'git' command as the first command-line argument.
 //
 // Example GOAUTH usage:
-// 	export GOAUTH="gitauth $HOME"
+//
+//	export GOAUTH="gitauth $HOME"
 //
 // See https://git-scm.com/docs/gitcredentials or run 'man gitcredentials' for
 // information on how to configure 'git credential'.

cmd/auth/netrcauth/netrcauth.go

@@ -7,7 +7,8 @@
 // It expects the location of the file as the first command-line argument.
 //
 // Example GOAUTH usage:
-// 	export GOAUTH="netrcauth $HOME/.netrc"
+//
+//	export GOAUTH="netrcauth $HOME/.netrc"
 //
 // See https://www.gnu.org/software/inetutils/manual/html_node/The-_002enetrc-file.html
 // or run 'man 5 netrc' for a description of the .netrc file format.

cmd/benchcmp/compare.go

@@ -109,8 +109,8 @@ func (x ByParseOrder) Swap(i, j int)      { x[i], x[j] = x[j], x[i] }
 func (x ByParseOrder) Less(i, j int) bool { return x[i].Before.Ord < x[j].Before.Ord }
 
 // lessByDelta provides lexicographic ordering:
-//   * largest delta by magnitude
-//   * alphabetic by name
+//   - largest delta by magnitude
+//   - alphabetic by name
 func lessByDelta(i, j BenchCmp, calcDelta func(BenchCmp) Delta) bool {
 	iDelta, jDelta := calcDelta(i).mag(), calcDelta(j).mag()
 	if iDelta != jDelta {

cmd/benchcmp/doc.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 /*
-
 Deprecated: benchcmp is deprecated in favor of benchstat: golang.org/x/perf/cmd/benchstat
 
 The benchcmp command displays performance changes between benchmarks.
@@ -34,6 +33,5 @@ in a format like this:
 
 	benchmark           old bytes     new bytes     delta
 	BenchmarkConcat     80            48            -40.00%
-
 */
 package main // import "golang.org/x/tools/cmd/benchcmp"

cmd/bundle/main.go

@@ -21,8 +21,8 @@
 //
 // By default, bundle writes the bundled code to standard output.
 // If the -o argument is given, bundle writes to the named file
-// and also includes a ``//go:generate'' comment giving the exact
-// command line used, for regenerating the file with ``go generate.''
+// and also includes a “//go:generate” comment giving the exact
+// command line used, for regenerating the file with “go generate.”
 //
 // Bundle customizes its output for inclusion in a particular package, the destination package.
 // By default bundle assumes the destination is the package in the current directory,
@@ -47,7 +47,7 @@
 // process. The -import option, which may be repeated, specifies that
 // an import of "old" should be rewritten to import "new" instead.
 //
-// Example
+// # Example
 //
 // Bundle archive/zip for inclusion in cmd/dist:
 //
@@ -68,7 +68,6 @@
 // Update all bundles in the standard library:
 //
 //	go generate -run bundle std
-//
 package main
 
 import (

cmd/callgraph/main.go

@@ -166,7 +166,7 @@ var stdout io.Writer = os.Stdout
 
 func doCallgraph(dir, gopath, algo, format string, tests bool, args []string) error {
 	if len(args) == 0 {
-		fmt.Fprintln(os.Stderr, Usage)
+		fmt.Fprint(os.Stderr, Usage)
 		return nil
 	}
 
@@ -187,7 +187,8 @@ func doCallgraph(dir, gopath, algo, format string, tests bool, args []string) er
 	}
 
 	// Create and build SSA-form program representation.
-	prog, pkgs := ssautil.AllPackages(initial, 0)
+	mode := ssa.InstantiateGenerics // instantiate generics by default for soundness
+	prog, pkgs := ssautil.AllPackages(initial, mode)
 	prog.Build()
 
 	// -- call graph construction ------------------------------------------

cmd/callgraph/main_test.go

@@ -15,6 +15,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -34,6 +35,10 @@ func init() {
 }
 
 func TestCallgraph(t *testing.T) {
+	if runtime.GOOS == "windows" && runtime.GOARCH == "arm64" {
+		t.Skipf("skipping due to suspected file corruption bug on windows/arm64 (https://go.dev/issue/50706)")
+	}
+
 	testenv.NeedsTool(t, "go")
 
 	gopath, err := filepath.Abs("testdata")