diff options
| -rw-r--r-- | android/util.go | 10 | ||||
| -rw-r--r-- | android/util_test.go | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/android/util.go b/android/util.go index 51313ceec..363b31ce5 100644 --- a/android/util.go +++ b/android/util.go @@ -15,6 +15,7 @@ package android import ( + "cmp" "fmt" "path/filepath" "reflect" @@ -106,15 +107,8 @@ func SortedStringKeys[V any](m map[string]V) []string { return SortedKeys(m) } -type Ordered interface { - ~string | - ~float32 | ~float64 | - ~int | ~int8 | ~int16 | ~int32 | ~int64 | - ~uint | ~uint8 | ~uint16 | ~uint32 | ~uint64 | ~uintptr -} - // SortedKeys returns the keys of the given map in the ascending order. -func SortedKeys[T Ordered, V any](m map[T]V) []T { +func SortedKeys[T cmp.Ordered, V any](m map[T]V) []T { if len(m) == 0 { return nil } diff --git a/android/util_test.go b/android/util_test.go index 699135bfc..8e73d835c 100644 --- a/android/util_test.go +++ b/android/util_test.go @@ -15,6 +15,7 @@ package android import ( + "cmp" "fmt" "reflect" "strconv" @@ -650,7 +651,7 @@ func BenchmarkFirstUniqueStrings(b *testing.B) { } } -func testSortedKeysHelper[K Ordered, V any](t *testing.T, name string, input map[K]V, expected []K) { +func testSortedKeysHelper[K cmp.Ordered, V any](t *testing.T, name string, input map[K]V, expected []K) { t.Helper() t.Run(name, func(t *testing.T) { actual := SortedKeys(input) |