From d797836cb82ea0d356f4122ed0e9469d0b7faf52 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 10 Jan 2024 22:02:05 -0300 Subject: [PATCH] chore(deps): upgrade x/exp/slices (#1462) --- go.mod | 2 +- go.sum | 4 ++-- internal/orderedmap/orderedmap.go | 2 +- internal/orderedmap/orderedmap_test.go | 10 ++++++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index aec2fbc5..a0a9f83e 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 github.com/zeebo/xxh3 v1.0.2 - golang.org/x/exp v0.0.0-20230212135524-a684f29349b6 + golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e golang.org/x/sync v0.6.0 golang.org/x/term v0.16.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index 732eada1..49e6ff55 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -golang.org/x/exp v0.0.0-20230212135524-a684f29349b6 h1:Ic9KukPQ7PegFzHckNiMTQXGgEszA7mY2Fn4ZMtnMbw= -golang.org/x/exp v0.0.0-20230212135524-a684f29349b6/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e h1:723BNChdd0c2Wk6WOE320qGBiPtYx0F0Bbm1kriShfE= +golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/internal/orderedmap/orderedmap.go b/internal/orderedmap/orderedmap.go index f34ad925..8a497f6b 100644 --- a/internal/orderedmap/orderedmap.go +++ b/internal/orderedmap/orderedmap.go @@ -90,7 +90,7 @@ func (om *OrderedMap[K, V]) Sort() { } // SortFunc will sort the map using the given function. -func (om *OrderedMap[K, V]) SortFunc(less func(i, j K) bool) { +func (om *OrderedMap[K, V]) SortFunc(less func(i, j K) int) { slices.SortFunc(om.s, less) } diff --git a/internal/orderedmap/orderedmap_test.go b/internal/orderedmap/orderedmap_test.go index 374b34da..f8b912c8 100644 --- a/internal/orderedmap/orderedmap_test.go +++ b/internal/orderedmap/orderedmap_test.go @@ -42,8 +42,14 @@ func TestSortFunc(t *testing.T) { om.Set(3, "three") om.Set(1, "one") om.Set(2, "two") - om.SortFunc(func(i, j int) bool { - return i > j + om.SortFunc(func(a, b int) int { + if a < b { + return 1 + } + if a > b { + return -1 + } + return 0 }) assert.Equal(t, []int{3, 2, 1}, om.s) }