Merge pull request #1 from outsidesource/feature/fix-amb

bdrobert · web-flow · commit 824b694529e7 · 2023-10-16T12:18:47.000-04:00
Fixed Amb to manually call cancelUpstream
diff --git a/Sources/Operators/Amb.swift b/Sources/Operators/Amb.swift
@@ -103,8 +103,10 @@ private extension Publishers.Amb {
                 guard let decision = decision else { return }
                 switch decision {
                 case .first:
+                    secondSink?.cancelUpstream()
                     secondSink = nil
                 case .second:
+                    firstSink?.cancelUpstream()
                     firstSink = nil
                 }
 
@@ -144,7 +146,9 @@ private extension Publishers.Amb {
         }
 
         func cancel() {
+            firstSink?.cancelUpstream()
             firstSink = nil
+            secondSink?.cancelUpstream()
             secondSink = nil
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,10 @@ private extension Publishers.Amb {`
`103`	`103`	`guard let decision = decision else { return }`
`104`	`104`	`switch decision {`
`105`	`105`	`case .first:`
	`106`	`+ secondSink?.cancelUpstream()`
`106`	`107`	`secondSink = nil`
`107`	`108`	`case .second:`
	`109`	`+ firstSink?.cancelUpstream()`
`108`	`110`	`firstSink = nil`
`109`	`111`	`}`
`110`	`112`
`@@ -144,7 +146,9 @@ private extension Publishers.Amb {`
`144`	`146`	`}`
`145`	`147`
`146`	`148`	`func cancel() {`
	`149`	`+ firstSink?.cancelUpstream()`
`147`	`150`	`firstSink = nil`
	`151`	`+ secondSink?.cancelUpstream()`
`148`	`152`	`secondSink = nil`
`149`	`153`	`}`
`150`	`154`	`}`