diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
| commit | 8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5 (patch) | |
| tree | ba71646a10b518372d110532d86fcf0b98edc14f /test/funcdup2.go | |
| parent | 3bb719bbf3cdb97b3901f3baaa2da9d02a5c3cdb (diff) | |
| parent | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (diff) | |
| download | golang-8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5.tar.gz | |
Merge tag 'upstream/1.3' into debian-sid
Upstream version 1.3
Diffstat (limited to 'test/funcdup2.go')
| -rw-r--r-- | test/funcdup2.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/funcdup2.go b/test/funcdup2.go index aeb5f7eb6..1db1a396b 100644 --- a/test/funcdup2.go +++ b/test/funcdup2.go @@ -7,11 +7,11 @@ package p var T interface { - F1(i int) (i int) // ERROR "duplicate argument i" - F2(i, i int) // ERROR "duplicate argument i" - F3() (i, i int) // ERROR "duplicate argument i" + F1(i int) (i int) // ERROR "duplicate argument i|redefinition|previous" + F2(i, i int) // ERROR "duplicate argument i|redefinition|previous" + F3() (i, i int) // ERROR "duplicate argument i|redefinition|previous" } -var T1 func(i, i int) // ERROR "duplicate argument i" -var T2 func(i int) (i int) // ERROR "duplicate argument i" -var T3 func() (i, i int) // ERROR "duplicate argument i" +var T1 func(i, i int) // ERROR "duplicate argument i|redefinition|previous" +var T2 func(i int) (i int) // ERROR "duplicate argument i|redefinition|previous" +var T3 func() (i, i int) // ERROR "duplicate argument i|redefinition|previous" |