From: Robert Griesemer <gri@golang.org>
Date: Thu, 18 Aug 2022 17:40:31 +0000 (-0700)
Subject: cmd/compile/internal/types2: match go/types for "..." related error msg
X-Git-Tag: go1.20rc1~1509
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4a954fafa3bc294ac56d5aea19dc3b0b3124d4c0;p=gostls13.git

cmd/compile/internal/types2: match go/types for "..." related error msg

For #54511.

Change-Id: I571680dfc25d7b7198e84e11bd311ab8b24d72d9
Reviewed-on: https://go-review.googlesource.com/c/go/+/424818
Reviewed-by: Robert Findley <rfindley@google.com>
Reviewed-by: Robert Griesemer <gri@google.com>
Run-TryBot: Robert Griesemer <gri@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
---

diff --git a/src/cmd/compile/internal/types2/call.go b/src/cmd/compile/internal/types2/call.go
index b1ea6917fb..bb0f86b2d6 100644
--- a/src/cmd/compile/internal/types2/call.go
+++ b/src/cmd/compile/internal/types2/call.go
@@ -137,7 +137,7 @@ func (check *Checker) callExpr(x *operand, call *syntax.CallExpr) exprKind {
 					}
 				}
 				if call.HasDots {
-					check.errorf(call.ArgList[0], "invalid use of ... in type conversion to %s", T)
+					check.errorf(call.ArgList[0], "invalid use of ... in conversion to %s", T)
 					break
 				}
 				check.conversion(x, T)
diff --git a/src/cmd/compile/internal/types2/testdata/fixedbugs/issue43124.go b/src/cmd/compile/internal/types2/testdata/fixedbugs/issue43124.go
index 7e48c2211b..f429f74a74 100644
--- a/src/cmd/compile/internal/types2/testdata/fixedbugs/issue43124.go
+++ b/src/cmd/compile/internal/types2/testdata/fixedbugs/issue43124.go
@@ -4,7 +4,7 @@
 
 package p
 
-var _ = int(0 /* ERROR invalid use of \.\.\. in type conversion */ ...)
+var _ = int(0 /* ERROR invalid use of \.\.\. in conversion to int */ ...)
 
 // test case from issue
 
@@ -12,5 +12,5 @@ type M []string
 
 var (
 	x = []string{"a", "b"}
-	_ = M(x /* ERROR invalid use of \.\.\. in type conversion */ ...)
+	_ = M(x /* ERROR invalid use of \.\.\. in conversion to M */ ...)
 )