From a682a5c711097378a72e6cf3d498832e813a14e8 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 17 Mar 2022 17:55:59 -0700 Subject: [PATCH] sort: generate generic variants with E rather than Elem MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For #51698 Change-Id: Ifc5bef2cc41b163644ac80ace7c1470c8a130467 Reviewed-on: https://go-review.googlesource.com/c/go/+/393700 Trust: Ian Lance Taylor Run-TryBot: Ian Lance Taylor TryBot-Result: Gopher Robot Reviewed-by: Eli Bendersky‎ --- src/sort/gen_sort_variants.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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) -- 2.48.1