Simplify iterator chaining for Find, Drop, Take

Author: BooleanCat

iter/chain.go

@@ -34,21 +34,3 @@ func (iter *ChainIter[T]) Next() option.Option[T] {
 }
 
 var _ Iterator[struct{}] = new(ChainIter[struct{}])
-
-// ForEach is a convenience method for [Find], providing this iterator as an
-// argument.
-func (iter *ChainIter[T]) Find(predicate func(T) bool) option.Option[T] {
-	return Find[T](iter, predicate)
-}
-
-// Drop is a convenience method for [Drop], providing this iterator as an
-// argument.
-func (iter *ChainIter[T]) Drop(n uint) *DropIter[T] {
-	return Drop[T](iter, n)
-}
-
-// Take is a convenience method for [Take], providing this iterator as an
-// argument.
-func (iter *ChainIter[T]) Take(n uint) *TakeIter[T] {
-	return Take[T](iter, n)
-}

iter/chain_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/BooleanCat/go-functional/internal/assert"
 	"github.com/BooleanCat/go-functional/internal/fakes"
 	"github.com/BooleanCat/go-functional/iter"
-	"github.com/BooleanCat/go-functional/option"
 )
 
 func ExampleChain() {
@@ -45,21 +44,3 @@ func TestChainExhausted(t *testing.T) {
 	assert.Equal(t, delegate1.NextCallCount(), 1)
 	assert.Equal(t, delegate2.NextCallCount(), 1)
 }
-
-func TestChainFind(t *testing.T) {
-	number := iter.Chain[int](iter.Lift([]int{1, 2}), iter.Lift([]int{3, 4})).Find(func(number int) bool {
-		return number == 3
-	})
-
-	assert.Equal(t, number, option.Some(3))
-}
-
-func TestChainDrop(t *testing.T) {
-	numbers := iter.Chain[int](iter.Lift([]int{1, 2}), iter.Lift([]int{3, 4})).Drop(1).Collect()
-	assert.SliceEqual(t, numbers, []int{2, 3, 4})
-}
-
-func TestChainTake(t *testing.T) {
-	numbers := iter.Chain[int](iter.Lift([]int{1, 2}), iter.Lift([]int{3, 4})).Take(3).Collect()
-	assert.SliceEqual(t, numbers, []int{1, 2, 3})
-}

iter/channel.go

@@ -28,21 +28,3 @@ func (iter *ChannelIter[T]) Next() option.Option[T] {
 }
 
 var _ Iterator[struct{}] = new(ChannelIter[struct{}])
-
-// Find is a convenience method for [Find], providing this iterator as an
-// argument.
-func (iter *ChannelIter[T]) Find(predicate func(T) bool) option.Option[T] {
-	return Find[T](iter, predicate)
-}
-
-// Drop is a convenience method for [Drop], providing this iterator as an
-// argument.
-func (iter *ChannelIter[T]) Drop(n uint) *DropIter[T] {
-	return Drop[T](iter, n)
-}
-
-// Take is a convenience method for [Take], providing this iterator as an
-// argument.
-func (iter *ChannelIter[T]) Take(n uint) *TakeIter[T] {
-	return Take[T](iter, n)
-}

iter/channel_test.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/BooleanCat/go-functional/internal/assert"
 	"github.com/BooleanCat/go-functional/iter"
-	"github.com/BooleanCat/go-functional/option"
 )
 
 func ExampleFromChannel() {
@@ -45,53 +44,3 @@ func TestFromChannelEmpty(t *testing.T) {
 	close(ch)
 	assert.True(t, iter.FromChannel(ch).Next().IsNone())
 }
-
-func TestFromChannelFind(t *testing.T) {
-	ch := make(chan int)
-
-	go func() {
-		defer close(ch)
-		ch <- 1
-		ch <- 2
-		ch <- 3
-	}()
-
-	numbers := iter.FromChannel(ch)
-	defer numbers.Collect()
-
-	number := numbers.Find(func(number int) bool {
-		return number == 2
-	})
-
-	assert.Equal(t, number, option.Some(2))
-}
-
-func TestFromChannelDrop(t *testing.T) {
-	ch := make(chan int)
-
-	go func() {
-		ch <- 1
-		ch <- 2
-		ch <- 3
-		close(ch)
-	}()
-
-	numbers := iter.FromChannel(ch).Drop(1).Collect()
-	assert.SliceEqual(t, numbers, []int{2, 3})
-}
-
-func TestFromChannelTake(t *testing.T) {
-	ch := make(chan int)
-
-	go func() {
-		defer close(ch)
-		ch <- 1
-		ch <- 2
-		ch <- 3
-	}()
-
-	iter := iter.FromChannel(ch)
-	numbers := iter.Take(2).Collect()
-	assert.SliceEqual(t, numbers, []int{1, 2})
-	iter.Collect() // To close the channel
-}

iter/counter.go

@@ -24,21 +24,3 @@ func (c *CountIter) Next() option.Option[int] {
 }
 
 var _ Iterator[int] = new(CountIter)
-
-// Find is a convenience method for [Find], providing this iterator as an
-// argument.
-func (iter *CountIter) Find(predicate func(int) bool) option.Option[int] {
-	return Find[int](iter, predicate)
-}
-
-// Drop is a convenience method for [Drop], providing this iterator as an
-// argument.
-func (c *CountIter) Drop(n uint) *DropIter[int] {
-	return Drop[int](c, n)
-}
-
-// Take is a convenience method for [Take], providing this iterator as an
-// argument.
-func (iter *CountIter) Take(n uint) *TakeIter[int] {
-	return Take[int](iter, n)
-}

iter/counter_test.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/BooleanCat/go-functional/internal/assert"
 	"github.com/BooleanCat/go-functional/iter"
-	"github.com/BooleanCat/go-functional/option"
 )
 
 func ExampleCount() {
@@ -27,19 +26,3 @@ func TestCount(t *testing.T) {
 	assert.Equal(t, counter.Next().Unwrap(), 1)
 	assert.Equal(t, counter.Next().Unwrap(), 2)
 }
-
-func TestCountFind(t *testing.T) {
-	assert.Equal(t, iter.Count().Find(func(number int) bool {
-		return number == 5
-	}), option.Some(5))
-}
-
-func TestCountDrop(t *testing.T) {
-	counter := iter.Count().Drop(5)
-	assert.Equal(t, counter.Next().Unwrap(), 5)
-}
-
-func TestCountTake(t *testing.T) {
-	numbers := iter.Count().Take(3).Collect()
-	assert.SliceEqual(t, numbers, []int{0, 1, 2})
-}

iter/cycle.go

@@ -51,21 +51,3 @@ func (iter *CycleIter[T]) Next() option.Option[T] {
 }
 
 var _ Iterator[struct{}] = new(CycleIter[struct{}])
-
-// Find is a convenience method for [Find], providing this iterator as an
-// argument.
-func (iter *CycleIter[T]) Find(predicate func(T) bool) option.Option[T] {
-	return Find[T](iter, predicate)
-}
-
-// Drop is a convenience method for [Drop], providing this iterator as an
-// argument.
-func (iter *CycleIter[T]) Drop(n uint) *DropIter[T] {
-	return Drop[T](iter, n)
-}
-
-// Take is a convenience method for [Take], providing this iterator as an
-// argument.
-func (iter *CycleIter[T]) Take(n uint) *TakeIter[T] {
-	return Take[T](iter, n)
-}

iter/cycle_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/BooleanCat/go-functional/internal/assert"
 	"github.com/BooleanCat/go-functional/internal/fakes"
 	"github.com/BooleanCat/go-functional/iter"
-	"github.com/BooleanCat/go-functional/option"
 )
 
 func ExampleCycle() {
@@ -39,19 +38,3 @@ func TestCycleExhausted(t *testing.T) {
 	assert.True(t, ones.Next().IsNone())
 	assert.Equal(t, delegate.NextCallCount(), 1)
 }
-
-func TestCycleFind(t *testing.T) {
-	assert.Equal(t, iter.Cycle[int](iter.Lift([]int{1, 2})).Find(func(number int) bool {
-		return number == 2
-	}), option.Some(2))
-}
-
-func TestCycleDrop(t *testing.T) {
-	items := iter.Cycle[int](iter.Lift([]int{1, 2})).Drop(1).Take(5).Collect()
-	assert.SliceEqual(t, items, []int{2, 1, 2, 1, 2})
-}
-
-func TestCycleTake(t *testing.T) {
-	items := iter.Cycle[int](iter.Lift([]int{1, 2})).Take(5).Collect()
-	assert.SliceEqual(t, items, []int{1, 2, 1, 2, 1})
-}

iter/drop.go

@@ -48,21 +48,3 @@ func (iter *DropIter[T]) delegateNext() option.Option[T] {
 }
 
 var _ Iterator[struct{}] = new(DropIter[struct{}])
-
-// Find is a convenience method for [Find], providing this iterator as an
-// argument.
-func (iter *DropIter[T]) Find(predicate func(T) bool) option.Option[T] {
-	return Find[T](iter, predicate)
-}
-
-// Drop is a convenience method for [Drop], providing this iterator as an
-// argument.
-func (iter *DropIter[T]) Drop(n uint) *DropIter[T] {
-	return Drop[T](iter, n)
-}
-
-// Take is a convenience method for [Take], providing this iterator as an
-// argument.
-func (iter *DropIter[T]) Take(n uint) *TakeIter[T] {
-	return Take[T](iter, n)
-}

iter/drop_test.go

@@ -49,19 +49,3 @@ func TestDropExhaustedLater(t *testing.T) {
 	assert.True(t, iterator.Next().IsNone())
 	assert.Equal(t, delegate.NextCallCount(), 3)
 }
-
-func TestDropFind(t *testing.T) {
-	assert.Equal(t, iter.Drop[int](iter.Count(), 5).Find(func(number int) bool {
-		return number%4 == 0
-	}), option.Some(8))
-}
-
-func TestDropDrop(t *testing.T) {
-	counter := iter.Count().Drop(2).Drop(3)
-	assert.Equal(t, counter.Next().Unwrap(), 5)
-}
-
-func TestDropTake(t *testing.T) {
-	numbers := iter.Count().Drop(2).Take(3).Collect()
-	assert.SliceEqual(t, numbers, []int{2, 3, 4})
-}