From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 18 Mar 2022 00:55:59 +0000 (-0700)
Subject: sort: generate generic variants with E rather than Elem
X-Git-Tag: go1.19beta1~1010
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a682a5c711097378a72e6cf3d498832e813a14e8;p=gostls13.git

sort: generate generic variants with E rather than Elem

For #51698

Change-Id: Ifc5bef2cc41b163644ac80ace7c1470c8a130467
Reviewed-on: https://go-review.googlesource.com/c/go/+/393700
Trust: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Eli Bendersky‎ <eliben@golang.org>
---

diff --git a/src/sort/gen_sort_variants.go b/src/sort/gen_sort_variants.go
index 5f817221e1..0ff1869544 100644
--- a/src/sort/gen_sort_variants.go
+++ b/src/sort/gen_sort_variants.go
@@ -79,10 +79,10 @@ func main() {
 			Package:    "slices",
 			Imports:    "import \"constraints\"\n",
 			FuncSuffix: "Ordered",
-			TypeParam:  "[Elem constraints.Ordered]",
+			TypeParam:  "[E constraints.Ordered]",
 			ExtraParam: "",
 			ExtraArg:   "",
-			DataType:   "[]Elem",
+			DataType:   "[]E",
 			Funcs: template.FuncMap{
 				"Less": func(name, i, j string) string {
 					return fmt.Sprintf("(%s[%s] < %s[%s])", name, i, name, j)
@@ -98,10 +98,10 @@ func main() {
 			Path:       "zsortanyfunc.go",
 			Package:    "slices",
 			FuncSuffix: "LessFunc",
-			TypeParam:  "[Elem any]",
-			ExtraParam: ", less func(a, b Elem) bool",
+			TypeParam:  "[E any]",
+			ExtraParam: ", less func(a, b E) bool",
 			ExtraArg:   ", less",
-			DataType:   "[]Elem",
+			DataType:   "[]E",
 			Funcs: template.FuncMap{
 				"Less": func(name, i, j string) string {
 					return fmt.Sprintf("less(%s[%s], %s[%s])", name, i, name, j)