]> Cypherpunks repositories - gostls13.git/commitdiff
sort: generate generic variants with E rather than Elem
authorIan Lance Taylor <iant@golang.org>
Fri, 18 Mar 2022 00:55:59 +0000 (17:55 -0700)
committerIan Lance Taylor <iant@golang.org>
Fri, 18 Mar 2022 19:32:40 +0000 (19:32 +0000)
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>
src/sort/gen_sort_variants.go

index 5f817221e119b8eeab60fc26c1d62bf96906b6ef..0ff18695446a387f909c8c4c56d722f0367f8444 100644 (file)
@@ -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)