go/types/mapsets: replace x/exp dependency with stdlib/cmp
Change-Id: I5a97afb12ae161b607e2c5640ca9429dba1461b0
Reviewed-on: https://review.monogon.dev/c/monogon/+/2320
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/go.mod b/go.mod
index 9de22c8..00cfc6a 100644
--- a/go.mod
+++ b/go.mod
@@ -125,7 +125,6 @@
go.etcd.io/etcd/tests/v3 v3.5.4
go.uber.org/multierr v1.11.0
golang.org/x/crypto v0.12.0
- golang.org/x/exp v0.0.0-20230725093048-515e97ebf090
golang.org/x/mod v0.12.0
golang.org/x/net v0.14.0
golang.org/x/sync v0.3.0
@@ -174,6 +173,7 @@
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/prometheus/exporter-toolkit v0.7.0 // indirect
github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a // indirect
+ golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 // indirect
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
k8s.io/klog v1.0.0 // indirect
diff --git a/go/types/mapsets/BUILD.bazel b/go/types/mapsets/BUILD.bazel
index 0df82e9..c90c852 100644
--- a/go/types/mapsets/BUILD.bazel
+++ b/go/types/mapsets/BUILD.bazel
@@ -5,7 +5,6 @@
srcs = ["orderedmap.go"],
importpath = "source.monogon.dev/go/types/mapsets",
visibility = ["//visibility:public"],
- deps = ["@org_golang_x_exp//constraints"],
)
go_test(
diff --git a/go/types/mapsets/orderedmap.go b/go/types/mapsets/orderedmap.go
index 8224268..1e29236 100644
--- a/go/types/mapsets/orderedmap.go
+++ b/go/types/mapsets/orderedmap.go
@@ -1,9 +1,8 @@
package mapsets
import (
+ "cmp"
"sort"
-
- "golang.org/x/exp/constraints"
)
// OrderedMap is a map from K to V which provides total ordering as defined by
@@ -33,7 +32,7 @@
// (string, integers, etc.) already implement it.
type Key interface {
comparable
- constraints.Ordered
+ cmp.Ordered
}
func (s *OrderedMap[K, V]) sort() {