f38da2cbb6
Make unify.go match the corresponding and reviewed go/types version. The remaining differences are due to other differences in the packages. Also, this version of unify opted to preserve the longer comment around case tj > 0. $ diff $GOROOT/src/cmd/compile/internal/types2/unify.go $GOROOT/src/go/types/unify.go 7c7 < package types2 --- > package types 9c9,12 < import "sort" --- > import ( > "go/token" > "sort" > ) 120,123d122 < // This case is handled like the default case. < // case tj > 0: < // // Only the type parameter for y has an inferred type. Use y slot for x. < // u.x.setIndex(i, tj) 125,126c124,125 < // Neither type parameter has an inferred type. Use y slot for x < // (or x slot for y, it doesn't matter). --- > // Either the type parameter for y has an inferred type, or neither type > // parameter has an inferred type. In either case, use y slot for x. 216c215 < // basic types and type parameters. We use Named() because we only --- > // basic types and type parameters. We use asNamed() because we only 219,222c218,221 < case !isNamed(x) && y != nil && y.Named() != nil: < return u.nify(x, y.Under(), p) < case x != nil && x.Named() != nil && !isNamed(y): < return u.nify(x.Under(), y, p) --- > case !isNamed(x) && y != nil && asNamed(y) != nil: > return u.nify(x, under(y), p) > case x != nil && asNamed(x) != nil && !isNamed(y): > return u.nify(under(x), y, p) 353,354c352,353 < u.check.completeInterface(nopos, x) < u.check.completeInterface(nopos, y) --- > u.check.completeInterface(token.NoPos, x) > u.check.completeInterface(token.NoPos, y) Change-Id: Icb246d4befedfa82cc3dcfdb7dd162cd4127fbe9 Reviewed-on: https://go-review.googlesource.com/c/go/+/278572 Trust: Robert Griesemer <gri@golang.org> Run-TryBot: Robert Griesemer <gri@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Robert Findley <rfindley@google.com> |
||
|---|---|---|
| .github | ||
| api | ||
| doc | ||
| lib/time | ||
| misc | ||
| src | ||
| test | ||
| .gitattributes | ||
| .gitignore | ||
| AUTHORS | ||
| CONTRIBUTING.md | ||
| CONTRIBUTORS | ||
| favicon.ico | ||
| LICENSE | ||
| PATENTS | ||
| README.md | ||
| robots.txt | ||
| SECURITY.md | ||
The Go Programming Language
Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.
Gopher image by Renee French, licensed under Creative Commons 3.0 Attributions license.
Our canonical Git repository is located at https://go.googlesource.com/go. There is a mirror of the repository at https://github.com/golang/go.
Unless otherwise noted, the Go source files are distributed under the BSD-style license found in the LICENSE file.
Download and Install
Binary Distributions
Official binary distributions are available at https://golang.org/dl/.
After downloading a binary release, visit https://golang.org/doc/install or load doc/install.html in your web browser for installation instructions.
Install From Source
If a binary distribution is not available for your combination of operating system and architecture, visit https://golang.org/doc/install/source or load doc/install-source.html in your web browser for source installation instructions.
Contributing
Go is the work of thousands of contributors. We appreciate your help!
To contribute, please read the contribution guidelines: https://golang.org/doc/contribute.html
Note that the Go project uses the issue tracker for bug reports and proposals only. See https://golang.org/wiki/Questions for a list of places to ask questions about the Go language.