diff options
author | Robert Griesemer <gri@golang.org> | 2020-12-21 13:41:23 -0800 |
---|---|---|
committer | Robert Griesemer <gri@golang.org> | 2020-12-22 17:50:13 +0000 |
commit | 53c4c17b098093a5636751407e120385031a2e3c (patch) | |
tree | 545aa8c7036b32d81b21c7d476ca88a618036b21 /test/fixedbugs/issue7310.go | |
parent | 060cdbc7b57d1c4e97038e3ad259d2572a58047f (diff) | |
parent | 4e8f681eff57803d8f3d40a71f6f70ed7618466b (diff) | |
download | go-git-53c4c17b098093a5636751407e120385031a2e3c.tar.gz |
[dev.typeparams] all: merge dev.regabi into dev.typeparams
The files below had conflicts that required manual resolution.
The unresolved conflict in noder.go was just in the import
declaration (trivial). All the other conflicts are in tests
where the ERROR regex patterns changed to accomodate gccgo
error messages (incoming from dev.regabi), and to accomodate
types2 in dev.typeparams. They were resolved by accepting the
dev.regabi changes (so as not to lose them) and then by re-
applying whatever changes needed to make them pass with types2.
Finally, the new test mainsig.go was excluded from run.go when
using types2 due to issue #43308.
src/cmd/compile/internal/gc/noder.go
test/fixedbugs/bug13343.go
test/fixedbugs/bug462.go
test/fixedbugs/issue10975.go
test/fixedbugs/issue11326.go
test/fixedbugs/issue11361.go
test/fixedbugs/issue11371.go
test/fixedbugs/issue11674.go
test/fixedbugs/issue13365.go
test/fixedbugs/issue13471.go
test/fixedbugs/issue14136.go
test/fixedbugs/issue14321.go
test/fixedbugs/issue14729.go
test/fixedbugs/issue15898.go
test/fixedbugs/issue16439.go
test/fixedbugs/issue17588.go
test/fixedbugs/issue19323.go
test/fixedbugs/issue19482.go
test/fixedbugs/issue19880.go
test/fixedbugs/issue20185.go
test/fixedbugs/issue20227.go
test/fixedbugs/issue20415.go
test/fixedbugs/issue20749.go
test/fixedbugs/issue22794.go
test/fixedbugs/issue22822.go
test/fixedbugs/issue22921.go
test/fixedbugs/issue23823.go
test/fixedbugs/issue25727.go
test/fixedbugs/issue26616.go
test/fixedbugs/issue28079c.go
test/fixedbugs/issue28450.go
test/fixedbugs/issue30085.go
test/fixedbugs/issue30087.go
test/fixedbugs/issue35291.go
test/fixedbugs/issue38745.go
test/fixedbugs/issue41247.go
test/fixedbugs/issue41440.go
test/fixedbugs/issue41500.go
test/fixedbugs/issue4215.go
test/fixedbugs/issue6402.go
test/fixedbugs/issue6772.go
test/fixedbugs/issue7129.go
test/fixedbugs/issue7150.go
test/fixedbugs/issue7153.go
test/fixedbugs/issue7310.go
test/fixedbugs/issue8183.go
test/fixedbugs/issue8385.go
test/fixedbugs/issue8438.go
test/fixedbugs/issue8440.go
test/fixedbugs/issue8507.go
test/fixedbugs/issue9370.go
test/fixedbugs/issue9521.go
Change-Id: I26e6e326fde6e3fca5400711a253834d710ab7f4
Diffstat (limited to 'test/fixedbugs/issue7310.go')
-rw-r--r-- | test/fixedbugs/issue7310.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/fixedbugs/issue7310.go b/test/fixedbugs/issue7310.go index ef099ce41e..4d10e47e64 100644 --- a/test/fixedbugs/issue7310.go +++ b/test/fixedbugs/issue7310.go @@ -9,7 +9,7 @@ package main func main() { - _ = copy(nil, []int{}) // ERROR "use of untyped nil|untyped nil" - _ = copy([]int{}, nil) // ERROR "use of untyped nil|untyped nil" - _ = 1 + true // ERROR "mismatched types untyped int and untyped bool|untyped int .* untyped bool" + _ = copy(nil, []int{}) // ERROR "use of untyped nil|left argument must be a slice|expects slice arguments" + _ = copy([]int{}, nil) // ERROR "use of untyped nil|second argument must be slice or string|expects slice arguments" + _ = 1 + true // ERROR "mismatched types untyped int and untyped bool|incompatible types|cannot convert" } |