On Go 1.21+, use cmp.Ordered instead of a private type

set/set.go

@@ -17,25 +17,26 @@
 package set
 
 import (
+	"cmp"
 	"sort"
 )
 
 // Empty is public since it is used by some internal API objects for conversions between external
 // string arrays and internal sets, and conversion logic requires public types today.
 type Empty struct{}
 
-// Set is a set of the same type elements, implemented via map[ordered]struct{} for minimal memory consumption.
-type Set[E ordered] map[E]Empty
+// Set is a set of the same type elements, implemented via map[cmp.Ordered]struct{} for minimal memory consumption.
+type Set[E cmp.Ordered] map[E]Empty
 
 // New creates a new set.
-func New[E ordered](items ...E) Set[E] {
+func New[E cmp.Ordered](items ...E) Set[E] {
 	ss := Set[E]{}
 	ss.Insert(items...)
 	return ss
 }
 
 // KeySet creates a Set[E] from a keys of a map[E](? extends interface{}).
-func KeySet[E ordered, A any](theMap map[E]A) Set[E] {
+func KeySet[E cmp.Ordered, A any](theMap map[E]A) Set[E] {
 	ret := Set[E]{}
 	for key := range theMap {
 		ret.Insert(key)
@@ -158,12 +159,12 @@
 	return s.Len() == s2.Len() && s.IsSuperset(s2)
 }
 
-type sortableSlice[E ordered] []E
+type sortableSlice[E cmp.Ordered] []E
 
 func (s sortableSlice[E]) Len() int {
 	return len(s)
 }
 func (s sortableSlice[E]) Less(i, j int) bool { return s[i] < s[j] }
 func (s sortableSlice[E]) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
 
 // SortedList returns the contents as a sorted slice.

set/set_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package set
 
 import (
+	"cmp"
 	"reflect"
 	"testing"
 )
@@ -369,7 +370,7 @@ func TestSetClearInSeparateFunction(t *testing.T) {
 	}
 }
 
-func clearSetAndAdd[T ordered](s Set[T], a T) {
+func clearSetAndAdd[T cmp.Ordered](s Set[T], a T) {
 	s.Clear()
 	s.Insert(a)
 }