filter.go

@@ -1,6 +1,6 @@
 package channel
 
-func FilterSuccessive[T any](source <-chan T, filter func(T) bool) <-chan T {
+func Filter[T any](source <-chan T, filter func(T) bool) <-chan T {
 	out := make(chan T, cap(source))
 
 	go func() {
@@ -14,26 +14,3 @@ func FilterSuccessive[T any](source <-chan T, filter func(T) bool) <-chan T {
 
 	return out
 }
-
-func Filter[T any](source <-chan T, filter func(T) bool) <-chan T {
-	return FilterPreserveOrderWithRunner(source, getDefaultRunner(), filter)
-}
-
-func FilterPreserveOrderWithRunner[T any](source <-chan T, runner Runner, filter func(T) bool) <-chan T {
-	type FilteredValue[T any] struct {
-		Value  T
-		Filter bool
-	}
-
-	mappedValues := MapPreserveOrderWithRunner(source, runner, func(value T) FilteredValue[T] {
-		return FilteredValue[T]{Value: value, Filter: filter(value)}
-	})
-
-	filteredValues := FilterSuccessive(mappedValues, func(filteredValue FilteredValue[T]) bool {
-		return filteredValue.Filter
-	})
-
-	return MapSuccessive(filteredValues, func(filteredValue FilteredValue[T]) T {
-		return filteredValue.Value
-	})
-}

flat.go

@@ -15,21 +15,6 @@ func FlatSlice[T any](source <-chan []T) <-chan T {
 	return out
 }
 
-func FlatMap[K comparable, V, T any](source <-chan map[K]V, unmapper func(key K, value V) T) <-chan T {
-	out := make(chan T, cap(source))
-
-	go func() {
-		defer close(out)
-		for slice := range source {
-			for k, v := range slice {
-				out <- unmapper(k, v)
-			}
-		}
-	}()
-
-	return out
-}
-
 func FlatChan[T any](source <-chan <-chan T) <-chan T {
 	out := make(chan T, cap(source))
 

go.mod

@@ -1,3 +1,3 @@
 module git.milar.in/milarin/channel
 
-go 1.23
+go 1.18

of.go

@@ -2,7 +2,6 @@ package channel
 
 import (
 	"context"
-	"iter"
 	"time"
 )
 
@@ -59,7 +58,7 @@ func OfFunc[T any](ctx context.Context, buffer int, f func() T) <-chan T {
 func OfMap[K comparable, V, T any](m map[K]V, unmapper func(K, V) T) <-chan T {
 	out := make(chan T, len(m))
 
-	go func() {
+	defer func() {
 		defer close(out)
 		for k, v := range m {
 			out <- unmapper(k, v)
@@ -68,32 +67,3 @@ func OfMap[K comparable, V, T any](m map[K]V, unmapper func(K, V) T) <-chan T {
 
 	return out
 }
-
-// OfSeq returns a channel containing all values provided by the iterator
-func OfSeq[T any](seq iter.Seq[T], buffer int) <-chan T {
-	out := make(chan T, buffer)
-
-	go func() {
-		defer close(out)
-		for v := range seq {
-			out <- v
-		}
-	}()
-
-	return out
-}
-
-// OfSeq2 returns a channel containing the return values of the unmapper function
-// when provided with the values of the iterator
-func OfSeq2[K comparable, V, T any](seq iter.Seq2[K, V], buffer int, unmapper func(K, V) T) <-chan T {
-	out := make(chan T, buffer)
-
-	go func() {
-		defer close(out)
-		for key, value := range seq {
-			out <- unmapper(key, value)
-		}
-	}()
-
-	return out
-}

result.go

@@ -13,12 +13,12 @@ func ResultOf[T any](value T, err error) Result[T] {
 	return Result[T]{value: &value, err: nil}
 }
 
-func WrapResultOutputFunc[I, O any](f func(I) (O, error)) func(I) Result[O] {
+func WrapMapFunc[I, O any](f func(I) (O, error)) func(I) Result[O] {
 	return func(i I) Result[O] { return ResultOf(f(i)) }
 }
 
-func WrapResultFunc[I, O any](f func(I) (O, error)) func(Result[I]) Result[O] {
+func ResultFunc[I, O any](f func(I) (O, error)) func(Result[I]) Result[O] {
-	resFunc := WrapResultOutputFunc(f)
+	resFunc := WrapMapFunc(f)
 	nilValue := *new(O)
 	return func(r Result[I]) Result[O] {
 		v, err := r.Get()