tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use ordered interface from cmp package

Browse source 
I just learned this exists.

Test: m nothing --no-skip-soong-tests
Change-Id: Ic6f0d11c24b41b394b1760fcca9e0da53243e6d9
This commit is contained in:
Cole Faust 2024-01-30 14:42:12 -08:00
parent a8a5f64222
commit efc70122af
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/util.go
View file

@ -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
}

3
android/util_test.go
View file

@ -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)