From 3bd4959700404eaee14786a649f19c091bb7c267 Mon Sep 17 00:00:00 2001 From: Michael Lore Date: Wed, 16 Aug 2023 20:32:08 -0400 Subject: [PATCH] Use new compare functions --- map.go | 9 +-------- tree.go | 11 +---------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/map.go b/map.go index 03dc9eb..33cae0f 100644 --- a/map.go +++ b/map.go @@ -31,14 +31,7 @@ func NewMapOrdered[K cmp.Ordered, V any]() *Map[K, V] { return &Map[K, V]{ t: Tree[Pair[K, V]]{ compare: func(v1, v2 Pair[K, V]) int { - switch { - case v1.Key < v2.Key: - return -1 - case v1.Key == v2.Key: - return 0 - default: - return 1 - } + return cmp.Compare(v1.Key, v2.Key) }, }, } diff --git a/tree.go b/tree.go index 22708e5..e8cc506 100644 --- a/tree.go +++ b/tree.go @@ -68,16 +68,7 @@ func New[T any](c func(T, T) int, flags byte) *Tree[T] { // NewOrdered returns an initialized tree using ordered types. func NewOrdered[T cmp.Ordered](flags byte) *Tree[T] { return &Tree[T]{ - compare: func(v1, v2 T) int { - switch { - case v1 < v2: - return -1 - case v1 == v2: - return 0 - default: - return 1 - } - }, + compare: cmp.Compare[T], treeFlags: flags, } }