remove internal/ctxwatch package

b97tsk · Sep 3, 2023 · 6f50185 · 6f50185
1 parent bfebcb9
commit 6f50185
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 257 deletions.
diff --git a/empty.go b/empty.go
@@ -3,7 +3,6 @@ package rx
 import (
 	"context"
 
-	"github.com/b97tsk/rx/internal/ctxwatch"
 	"github.com/b97tsk/rx/internal/waitgroup"
 )
 
@@ -30,7 +29,7 @@ func never[T any](ctx context.Context, sink Observer[T]) {
 			wg.Add(1)
 		}
 
-		ctxwatch.Add(ctx, func() {
+		context.AfterFunc(ctx, func() {
 			if wg != nil {
 				defer wg.Done()
 			}

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/b97tsk/rx
 
-go 1.19
+go 1.21.0
 
 require golang.org/x/exp v0.0.0-20220428152302-39d4317da171
 

diff --git a/internal/ctxwatch/ctxwatch.go b/internal/ctxwatch/ctxwatch.go
diff --git a/internal/ctxwatch/ctxwatch_test.go b/internal/ctxwatch/ctxwatch_test.go
diff --git a/multicast.go b/multicast.go
@@ -5,7 +5,6 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/b97tsk/rx/internal/ctxwatch"
 	"github.com/b97tsk/rx/internal/waitgroup"
 )
 
@@ -102,7 +101,7 @@ func (m *multicast[T]) subscribe(ctx context.Context, sink Observer[T]) {
 			wg.Add(1)
 		}
 
-		ctxwatch.Add(ctx, func() {
+		context.AfterFunc(ctx, func() {
 			if wg != nil {
 				defer wg.Done()
 			}

diff --git a/multicastreplay.go b/multicastreplay.go
@@ -6,7 +6,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/b97tsk/rx/internal/ctxwatch"
 	"github.com/b97tsk/rx/internal/queue"
 	"github.com/b97tsk/rx/internal/waitgroup"
 )
@@ -180,7 +179,7 @@ func (m *multicastReplay[T]) subscribe(ctx context.Context, sink Observer[T]) {
 			wg.Add(1)
 		}
 
-		ctxwatch.Add(ctx, func() {
+		context.AfterFunc(ctx, func() {
 			if wg != nil {
 				defer wg.Done()
 			}

diff --git a/share.go b/share.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"sync"
 
-	"github.com/b97tsk/rx/internal/ctxwatch"
 	"github.com/b97tsk/rx/internal/waitgroup"
 )
 
@@ -137,7 +136,7 @@ func (obs *shareObservable[T]) Subscribe(ctx context.Context, sink Observer[T])
 		wg.Add(1)
 	}
 
-	ctxwatch.Add(ctx, func() {
+	context.AfterFunc(ctx, func() {
 		if wg != nil {
 			defer wg.Done()
 		}