Simplify iterator chaining for ForEach

Author: BooleanCat

iter/chain.go

@@ -35,12 +35,6 @@ func (iter *ChainIter[T]) Next() option.Option[T] {
 
 var _ Iterator[struct{}] = new(ChainIter[struct{}])
 
-// ForEach is a convenience method for [ForEach], providing this iterator as an
-// argument.
-func (iter *ChainIter[T]) ForEach(callback func(T)) {
-	ForEach[T](iter, callback)
-}
-
 // 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] {

iter/chain_test.go

@@ -46,16 +46,6 @@ func TestChainExhausted(t *testing.T) {
 	assert.Equal(t, delegate2.NextCallCount(), 1)
 }
 
-func TestChainForEach(t *testing.T) {
-	total := 0
-
-	iter.Chain[int](iter.Lift([]int{1, 2}), iter.Lift([]int{3, 4})).ForEach(func(number int) {
-		total += number
-	})
-
-	assert.Equal(t, total, 10)
-}
-
 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

iter/channel.go

@@ -29,12 +29,6 @@ func (iter *ChannelIter[T]) Next() option.Option[T] {
 
 var _ Iterator[struct{}] = new(ChannelIter[struct{}])
 
-// ForEach is a convenience method for [ForEach], providing this iterator as an
-// argument.
-func (iter *ChannelIter[T]) ForEach(callback func(T)) {
-	ForEach[T](iter, callback)
-}
-
 // 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] {

iter/channel_test.go

@@ -46,25 +46,6 @@ func TestFromChannelEmpty(t *testing.T) {
 	assert.True(t, iter.FromChannel(ch).Next().IsNone())
 }
 
-func TestFromChannelForEach(t *testing.T) {
-	ch := make(chan int)
-
-	go func() {
-		defer close(ch)
-		ch <- 1
-		ch <- 2
-		ch <- 3
-	}()
-
-	total := 0
-
-	iter.FromChannel(ch).ForEach(func(number int) {
-		total += number
-	})
-
-	assert.Equal(t, total, 6)
-}
-
 func TestFromChannelFind(t *testing.T) {
 	ch := make(chan int)
 

iter/counter.go

@@ -25,12 +25,6 @@ func (c *CountIter) Next() option.Option[int] {
 
 var _ Iterator[int] = new(CountIter)
 
-// ForEach is a convenience method for [ForEach], providing this iterator as an
-// argument.
-func (iter *CountIter) ForEach(callback func(int)) {
-	ForEach[int](iter, callback)
-}
-
 // Find is a convenience method for [Find], providing this iterator as an
 // argument.
 func (iter *CountIter) Find(predicate func(int) bool) option.Option[int] {

iter/counter_test.go

@@ -28,18 +28,6 @@ func TestCount(t *testing.T) {
 	assert.Equal(t, counter.Next().Unwrap(), 2)
 }
 
-func TestCountForEach(t *testing.T) {
-	defer func() {
-		assert.Equal(t, recover(), "oops")
-	}()
-
-	iter.Count().ForEach(func(_ int) {
-		panic("oops")
-	})
-
-	t.Error("did not panic")
-}
-
 func TestCountFind(t *testing.T) {
 	assert.Equal(t, iter.Count().Find(func(number int) bool {
 		return number == 5

iter/cycle.go

@@ -52,12 +52,6 @@ func (iter *CycleIter[T]) Next() option.Option[T] {
 
 var _ Iterator[struct{}] = new(CycleIter[struct{}])
 
-// ForEach is a convenience method for [ForEach], providing this iterator as an
-// argument.
-func (iter *CycleIter[T]) ForEach(callback func(T)) {
-	ForEach[T](iter, callback)
-}
-
 // 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] {

iter/cycle_test.go

@@ -40,18 +40,6 @@ func TestCycleExhausted(t *testing.T) {
 	assert.Equal(t, delegate.NextCallCount(), 1)
 }
 
-func TestCycleForEach(t *testing.T) {
-	defer func() {
-		assert.Equal(t, recover(), "oops")
-	}()
-
-	iter.Cycle[int](iter.Lift([]int{1, 2})).ForEach(func(_ int) {
-		panic("oops")
-	})
-
-	t.Error("did not panic")
-}
-
 func TestCycleFind(t *testing.T) {
 	assert.Equal(t, iter.Cycle[int](iter.Lift([]int{1, 2})).Find(func(number int) bool {
 		return number == 2

iter/drop.go

@@ -49,12 +49,6 @@ func (iter *DropIter[T]) delegateNext() option.Option[T] {
 
 var _ Iterator[struct{}] = new(DropIter[struct{}])
 
-// ForEach is a convenience method for [ForEach], providing this iterator as an
-// argument.
-func (iter *DropIter[T]) ForEach(callback func(T)) {
-	ForEach[T](iter, callback)
-}
-
 // 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] {

iter/drop_test.go

@@ -50,16 +50,6 @@ func TestDropExhaustedLater(t *testing.T) {
 	assert.Equal(t, delegate.NextCallCount(), 3)
 }
 
-func TestDropForEach(t *testing.T) {
-	total := 0
-
-	iter.Lift([]int{1, 2, 3, 4}).Drop(1).ForEach(func(number int) {
-		total += number
-	})
-
-	assert.Equal(t, total, 9)
-}
-
 func TestDropFind(t *testing.T) {
 	assert.Equal(t, iter.Drop[int](iter.Count(), 5).Find(func(number int) bool {
 		return number%4 == 0