Sequential create and defer

ReactiveX · Feb 26, 2020 · e94d354 · e94d354
1 parent 42278d5
commit e94d354
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 28 deletions.
diff --git a/iterable_create.go b/iterable_create.go
@@ -18,18 +18,11 @@ func newCreateIterable(fs []Producer, opts ...Option) Iterable {
  next := option.buildChannel()
  ctx := option.buildContext()
 
- wg := sync.WaitGroup{}
- for _, f := range fs {
- f := f
- wg.Add(1)
- go func() {
- defer wg.Done()
- f(ctx, next)
- }()
- }
  go func() {
- wg.Wait()
- close(next)
+ defer close(next)
+ for _, f := range fs {
+ f(ctx, next)
+ }
  }()
 
  return &createIterable{

diff --git a/iterable_defer.go b/iterable_defer.go
@@ -1,17 +1,13 @@
 package rxgo
 
-import (
- "sync"
-)
-
 type deferIterable struct {
- f  []Producer
+ fs []Producer
  opts []Option
 }
 
 func newDeferIterable(f []Producer, opts ...Option) Iterable {
  return &deferIterable{
- f:  f,
+ fs: f,
  opts: opts,
  }
 }
@@ -21,18 +17,11 @@ func (i *deferIterable) Observe(opts ...Option) <-chan Item {
  next := option.buildChannel()
  ctx := option.buildContext()
 
- wg := sync.WaitGroup{}
- for _, f := range i.f {
- f := f
- wg.Add(1)
- go func() {
- defer wg.Done()
- f(ctx, next)
- }()
- }
  go func() {
- wg.Wait()
- close(next)
+ defer close(next)
+ for _, f := range i.fs {
+ f(ctx, next)
+ }
  }()
 
  return next