Merge pull request #13 from go-board/feat/deprecate_delegate

[delegate] clean usage, remove pkg
go-board · Jun 12, 2022 · 5fcd993 · 5fcd993
2 parents 75aeded + 49048e4
commit 5fcd993
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 113 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,6 @@ go get -u github.com/go-board/std
     - [queue](https://github.com/go-board/std/blob/master/collections/queue) double ended queue
 - [cond](https://github.com/go-board/std/blob/master/cond) conditional operator
 - [core](https://github.com/go-board/std/blob/master/core) core types & constraints
-- [~~delegate~~](https://github.com/go-board/std/blob/master/delegate) [DEPRECATED] delegate function signature
 - [hash](https://github.com/go-board/std/blob/master/hash) hash a object
 - [iterator](https://github.com/go-board/std/blob/master/iterator) iterators
     - [adapters](https://github.com/go-board/std/blob/master/iterator/adapters) adapter to create iterators & streams

diff --git a/algorithm/dp/dp.go b/algorithm/dp/dp.go
@@ -1,8 +1,10 @@
 package dp
 
-import "github.com/go-board/std/delegate"
+import (
+	"github.com/go-board/std/cmp"
+)
 
-func LcsBy[T any](left []T, right []T, eq delegate.Equal[T]) []T {
+func LcsBy[T any](left []T, right []T, eq cmp.EqFunc[T]) []T {
 	if len(left) == 0 || len(right) == 0 {
 		return nil
 	}

diff --git a/clone/clone.go b/clone/clone.go
@@ -1,11 +1,7 @@
 package clone
 
-import (
-	"github.com/go-board/std/delegate"
-)
-
 type Cloneable[T any] interface{ Clone() T }
 
 func Clone[T Cloneable[T]](o T) T { return o.Clone() }
 
-type Cloner[T any] delegate.Function1[T, T]
+type Cloner[T any] func(T) T
diff --git a/collections/btree/map.go b/collections/btree/map.go
@@ -2,7 +2,6 @@ package btree
 
 import (
 	"github.com/go-board/std/clone"
-	"github.com/go-board/std/delegate"
 	"github.com/go-board/std/iterator"
 	"github.com/go-board/std/optional"
 	"github.com/go-board/std/tuple"
@@ -25,7 +24,7 @@ func (self MapEntry[K, V]) Value() V { return self.inner.Second() }
 
 // TreeMap is a map based on a B-Tree.
 type TreeMap[TKey, TValue any] struct {
-	less  delegate.Lt[TKey]
+	less  func(TKey, TKey) bool
 	inner *btree.Generic[MapEntry[TKey, TValue]]
 }
 
@@ -35,7 +34,7 @@ var (
 )
 
 // NewTreeMap creates a new TreeMap.
-func NewTreeMap[TKey, TValue any](less delegate.Lt[TKey]) *TreeMap[TKey, TValue] {
+func NewTreeMap[TKey, TValue any](less func(TKey, TKey) bool) *TreeMap[TKey, TValue] {
 	entryLessFn := func(a, b MapEntry[TKey, TValue]) bool { return less(a.Key(), b.Key()) }
 	return &TreeMap[TKey, TValue]{inner: btree.NewGeneric(entryLessFn)}
 }

diff --git a/collections/btree/set.go b/collections/btree/set.go
@@ -2,7 +2,6 @@ package btree
 
 import (
 	"github.com/go-board/std/clone"
-	"github.com/go-board/std/delegate"
 	"github.com/go-board/std/iterator"
 	"github.com/go-board/std/iterator/stream"
 	"github.com/go-board/std/optional"
@@ -20,7 +19,7 @@ var (
 )
 
 // NewTreeSet creates a new TreeSet.
-func NewTreeSet[TElement any](less delegate.Lt[TElement]) *TreeSet[TElement] {
+func NewTreeSet[TElement any](less func(TElement, TElement) bool) *TreeSet[TElement] {
 	return &TreeSet[TElement]{inner: btree.NewGeneric(less)}
 }
 

diff --git a/collections/collection.go b/collections/collection.go
@@ -2,21 +2,20 @@ package collections
 
 import (
 	"github.com/go-board/std/collections/btree"
-	"github.com/go-board/std/delegate"
 )
 
 type TreeMap[TKey, TValue any] struct {
 	*btree.TreeMap[TKey, TValue]
 }
 
-func NewTreeMap[TKey, TValue any](less delegate.Lt[TKey]) *TreeMap[TKey, TValue] {
+func NewTreeMap[TKey, TValue any](less func(TKey, TKey) bool) *TreeMap[TKey, TValue] {
 	return &TreeMap[TKey, TValue]{btree.NewTreeMap[TKey, TValue](less)}
 }
 
 type TreeSet[TElement any] struct {
 	*btree.TreeSet[TElement]
 }
 
-func NewTreeSet[TElement any](less delegate.Lt[TElement]) *TreeSet[TElement] {
+func NewTreeSet[TElement any](less func(TElement, TElement) bool) *TreeSet[TElement] {
 	return &TreeSet[TElement]{btree.NewTreeSet(less)}
 }
diff --git a/delegate/comparison.go b/delegate/comparison.go
diff --git a/delegate/consumer.go b/delegate/consumer.go
diff --git a/delegate/function.go b/delegate/function.go
diff --git a/delegate/predicate.go b/delegate/predicate.go
diff --git a/delegate/transform.go b/delegate/transform.go
diff --git a/lazy/lazy.go b/lazy/lazy.go
@@ -2,18 +2,16 @@ package lazy
 
 import (
 	"sync"
-
-	"github.com/go-board/std/delegate"
 )
 
 // Lazy is a lazy value.
 type Lazy[T any] struct {
 	compute func() T
 }
 
-func NewLazy[T any](compute func() T) *Lazy[T]            { return &Lazy[T]{compute} }
-func (self *Lazy[T]) Get() T                              { return self.compute() }
-func (self *Lazy[T]) With(consumer delegate.Consumer1[T]) { consumer(self.Get()) }
+func NewLazy[T any](compute func() T) *Lazy[T] { return &Lazy[T]{compute} }
+func (self *Lazy[T]) Get() T                   { return self.compute() }
+func (self *Lazy[T]) With(consumer func(T))    { consumer(self.Get()) }
 
 // OnceLazy is a lazy value that is computed only once.
 type OnceLazy[T any] struct {
@@ -31,6 +29,6 @@ func (self *OnceLazy[T]) Get() T {
 	return self.inner
 }
 
-func (self *OnceLazy[T]) With(consumer delegate.Consumer1[T]) {
+func (self *OnceLazy[T]) With(consumer func(T)) {
 	consumer(self.Get())
 }