Replace ResultsWithProcess with ResultsWithContext

Author: gammazero

query/query.go

@@ -243,8 +243,7 @@ func NewResultBuilder(q Query) *ResultBuilder {
 // DEPRECATED: This iterator is impossible to cancel correctly. Canceling it
 // will leave anything trying to write to the result channel hanging.
 func ResultsWithChan(q Query, res <-chan Result) Results {
-	proc := func(ctx context.Context, cancel context.CancelFunc, out chan<- Result) {
-		defer cancel()
+	return ResultsWithContext(q, func(ctx context.Context, out chan<- Result) {
 		for {
 			select {
 			case <-ctx.Done(): // client told us to close early
@@ -261,12 +260,18 @@ func ResultsWithChan(q Query, res <-chan Result) Results {
 				}
 			}
 		}
-	}
+	})
+}
 
+// ResultsWithCtxs returns a Results object with the results generated by the
+// passed proc function called in a separate goroutine.
+func ResultsWithContext(q Query, proc func(context.Context, chan<- Result)) Results {
 	b := NewResultBuilder(q)
 
-	// go consume all the entries and add them to the results.
-	go proc(b.ctx, b.cancel, b.Output)
+	go func() {
+		defer b.cancel()
+		proc(b.ctx, b.Output)
+	}()
 
 	return b.Results()
 }