feat(maps): 1.21 no keys/values

maps/maps.go

@@ -2,10 +2,35 @@ package maps
 
 import "github.com/go-board/std/tuple"
 
-type MapEntry[K, V any] struct {
-	inner tuple.Pair[K, V]
-}
+type MapEntry[K, V any] struct{ inner tuple.Pair[K, V] }
+
+func (e MapEntry[K, V]) Key() K   { return e.inner.First }
+func (e MapEntry[K, V]) Value() V { return e.inner.Second }
 
 func entry[K, V any](key K, value V) MapEntry[K, V] {
 	return MapEntry[K, V]{inner: tuple.PairOf(key, value)}
 }
+
+func Entries[K comparable, V any, M ~map[K]V](m M) []MapEntry[K, V] {
+	entries := make([]MapEntry[K, V], 0, len(m))
+	for k, v := range m {
+		entries = append(entries, entry(k, v))
+	}
+	return entries
+}
+
+func Keys[K comparable, V any, M ~map[K]V](m M) []K {
+	ks := make([]K, 0, len(m))
+	for k := range m {
+		ks = append(ks, k)
+	}
+	return ks
+}
+
+func Values[K comparable, V any, M ~map[K]V](m M) []V {
+	vs := make([]V, 0, len(m))
+	for _, v := range m {
+		vs = append(vs, v)
+	}
+	return vs
+}

maps/maps_1_20.go

@@ -15,22 +15,6 @@ func Entries[K comparable, V any, M ~map[K]V](m M) []MapEntry[K, V] {
 	return es
 }
 
-func Keys[K comparable, V any, M ~map[K]V](m M) []K {
-	ks := make([]K, 0, len(m))
-	for k := range m {
-		ks = append(ks, k)
-	}
-	return ks
-}
-
-func Values[K comparable, V any, M ~map[K]V](m M) []V {
-	vs := make([]V, 0, len(m))
-	for _, v := range m {
-		vs = append(vs, v)
-	}
-	return vs
-}
-
 func Clone[K comparable, V any, M ~map[K]V](m M) M {
 	r := make(M)
 	for k, v := range m {

maps/maps_1_21.go

@@ -4,21 +4,6 @@ package maps
 
 import "maps"
 
-func Entries[K comparable, V any, M ~map[K]V](m M) []MapEntry[K, V] {
-	es := make([]MapEntry[K, V], 0, len(m))
-	for k, v := range m {
-		es = append(es, entry(k, v))
-	}
-	return es
-}
-
-func Keys[K comparable, V any, M ~map[K]V](m M) []K {
-	return maps.Keys(m)
-}
-
-func Values[K comparable, V any, M ~map[K]V](m M) []V {
-	return maps.Values(m)
-}
 
 func Equal[K comparable, V comparable, M1 ~map[K]V, M2 ~map[K]V](lhs M1, rhs M2) bool {
 	return maps.Equal(lhs, rhs)