]> Cypherpunks repositories - gostls13.git/commit
[dev.typeparams] merge: merge branch 'dev.regabi' into 'dev.typeparams'
authorRobert Griesemer <gri@golang.org>
Mon, 14 Dec 2020 19:53:55 +0000 (11:53 -0800)
committerRobert Griesemer <gri@golang.org>
Mon, 14 Dec 2020 20:13:36 +0000 (12:13 -0800)
commit91803a2df334ddfc9377ef4d07cc5f0eff51b6a2
tree277500790211cdab0ee3f12e1833efa44495afbc
parenta20021227e987a24d3dbac5118a9dee4d90a96ff
parent89f38323faa57d3f7475016f778be69fcffbe9fb
[dev.typeparams] merge: merge branch 'dev.regabi' into 'dev.typeparams'

The following files had merge conflicts and were merged manually:

src/cmd/compile/fmtmap_test.go
src/cmd/compile/internal/gc/noder.go
src/go/parser/error_test.go
test/assign.go
test/chan/perm.go
test/fixedbugs/issue22822.go
test/fixedbugs/issue4458.go
test/init.go
test/interface/explicit.go
test/map1.go
test/method2.go

The following files had manual changes to make tests pass:

test/run.go
test/used.go
src/cmd/compile/internal/types2/stdlib_test.go

Change-Id: Ia495aaaa80ce321ee4ec2a9105780fbe913dbd4c
24 files changed:
src/cmd/compile/fmtmap_test.go
src/cmd/compile/internal/gc/go.go
src/cmd/compile/internal/gc/main.go
src/cmd/compile/internal/gc/noder.go
src/cmd/compile/internal/types2/stdlib_test.go
src/cmd/dist/buildtool.go
src/go/internal/gccgoimporter/importer_test.go
src/go/parser/error_test.go
src/go/parser/interface.go
src/go/printer/printer_test.go
src/go/types/check.go
src/go/types/decl.go
src/go/types/predicates.go
test/assign.go
test/blank1.go
test/chan/perm.go
test/fixedbugs/issue22822.go
test/fixedbugs/issue4458.go
test/init.go
test/interface/explicit.go
test/map1.go
test/method2.go
test/run.go
test/used.go