cedar-go: reduce the usage of x/exp/maps in favor of the standard library

Signed-off-by: Patrick Jakubowski <patrick.jakubowski@strongdm.com>

Author: patjakdev

internal/mapset/immutable_test.go

@@ -39,7 +39,7 @@ func TestImmutableMapSet(t *testing.T) {
 
 	t.Run("slice", func(t *testing.T) {
 		s := Immutable[int]()
-		testutil.Equals(t, s.Slice(), []int{})
+		testutil.Equals(t, s.Slice(), []int(nil))
 
 		inSlice := []int{1, 2, 3}
 		s = Immutable[int](inSlice...)

internal/mapset/mapset.go

@@ -5,9 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"iter"
+	"maps"
 	"slices"
-
-	"golang.org/x/exp/maps"
 )
 
 // Similar to the concept of a [legal peppercorn](https://en.wikipedia.org/wiki/Peppercorn_(law)), this instance of
@@ -118,7 +117,7 @@ func (h MapSet[T]) Slice() []T {
 	if h.m == nil {
 		return nil
 	}
-	return maps.Keys(h.m)
+	return slices.Collect(maps.Keys(h.m))
 }
 
 // Len returns the size of the MapSet

internal/mapset/mapset_test.go

@@ -63,10 +63,10 @@ func TestMapSet(t *testing.T) {
 
 	t.Run("slice", func(t *testing.T) {
 		s := Make[int]()
-		testutil.Equals(t, s.Slice(), []int{})
+		testutil.Equals(t, s.Slice(), []int(nil))
 
 		s = Make[int](10)
-		testutil.Equals(t, s.Slice(), []int{})
+		testutil.Equals(t, s.Slice(), []int(nil))
 
 		inSlice := []int{1, 2, 3}
 		s = FromItems(inSlice...)

types/entity_map.go

@@ -2,10 +2,9 @@ package types
 
 import (
 	"encoding/json"
+	"maps"
 	"slices"
 	"strings"
-
-	"golang.org/x/exp/maps"
 )
 
 // An EntityGetter is an interface for retrieving an Entity by EntityUID.
@@ -21,7 +20,7 @@ var _ EntityGetter = EntityMap{}
 type EntityMap map[EntityUID]Entity
 
 func (e EntityMap) MarshalJSON() ([]byte, error) {
-	s := maps.Values(e)
+	s := slices.Collect(maps.Values(e))
 	slices.SortFunc(s, func(a, b Entity) int {
 		return strings.Compare(a.UID.String(), b.UID.String())
 	})

types/record.go

@@ -6,10 +6,9 @@ import (
 	"encoding/json"
 	"hash/fnv"
 	"iter"
+	"maps"
 	"slices"
 	"strconv"
-
-	"golang.org/x/exp/maps"
 )
 
 type RecordMap = map[String]Value
@@ -27,7 +26,7 @@ func NewRecord(m RecordMap) Record {
 	// NewRecord(RecordMap{}) are the same
 	var hashVal uint64
 	if len(m) > 0 {
-		orderedKeys := maps.Keys(m)
+		orderedKeys := slices.Collect(maps.Keys(m))
 		slices.Sort(orderedKeys)
 
 		h := fnv.New64()
@@ -146,7 +145,7 @@ func (r *Record) UnmarshalJSON(b []byte) error {
 func (r Record) MarshalJSON() ([]byte, error) {
 	w := &bytes.Buffer{}
 	w.WriteByte('{')
-	keys := maps.Keys(r.m)
+	keys := slices.Collect(maps.Keys(r.m))
 	slices.Sort(keys)
 	for i, kk := range keys {
 		if i > 0 {
@@ -174,7 +173,7 @@ func (r Record) MarshalCedar() []byte {
 	var sb bytes.Buffer
 	sb.WriteRune('{')
 	first := true
-	keys := maps.Keys(r.m)
+	keys := slices.Collect(maps.Keys(r.m))
 	slices.Sort(keys)
 	for _, k := range keys {
 		v := r.m[k]

types/set.go

@@ -4,9 +4,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"iter"
+	"maps"
 	"slices"
-
-	"golang.org/x/exp/maps"
 )
 
 // A Set is an immutable collection of elements that can be of the same or different types.
@@ -42,7 +41,7 @@ func NewSet(v ...Value) Set {
 	// Special case hashVal for empty set to 0 so that the return value of Value.hash() of Set{} and NewSet([]Value{})
 	// are the same
 	var hashVal uint64
-	for _, v := range maps.Values(set) {
+	for v := range maps.Values(set) {
 		hashVal += v.hash()
 	}
 
@@ -100,7 +99,7 @@ func (s Set) Slice() []Value {
 	if s.s == nil {
 		return nil
 	}
-	return maps.Values(s.s)
+	return slices.Collect(maps.Values(s.s))
 }
 
 // Equal returns true if the sets are Equal.
@@ -148,7 +147,7 @@ func (s *Set) UnmarshalJSON(b []byte) error {
 func (s Set) MarshalJSON() ([]byte, error) {
 	w := &bytes.Buffer{}
 	w.WriteByte('[')
-	orderedKeys := maps.Keys(s.s)
+	orderedKeys := slices.Collect(maps.Keys(s.s))
 	slices.Sort(orderedKeys)
 	for i, k := range orderedKeys {
 		if i != 0 {
@@ -172,7 +171,7 @@ func (s Set) String() string { return string(s.MarshalCedar()) }
 func (s Set) MarshalCedar() []byte {
 	var sb bytes.Buffer
 	sb.WriteRune('[')
-	orderedKeys := maps.Keys(s.s)
+	orderedKeys := slices.Collect(maps.Keys(s.s))
 	slices.Sort(orderedKeys)
 	for i, k := range orderedKeys {
 		if i != 0 {