1
0
mirror of https://github.com/golang/go synced 2024-11-11 22:50:22 -07:00
go/test/interface
Robert Griesemer 91803a2df3 [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
2020-12-14 12:13:36 -08:00
..
embed1.dir
embed3.dir
private.dir
recursive1.dir
assertinline.go
bigdata.go
convert1.go
convert2.go
convert.go
embed1.go
embed2.go
embed3.go
embed.go
explicit.go [dev.typeparams] merge: merge branch 'dev.regabi' into 'dev.typeparams' 2020-12-14 12:13:36 -08:00
fail.go
fake.go
noeq.go
pointer.go
private.go
receiver1.go
receiver.go
recursive1.go
recursive.go
returntype.go
struct.go