Fix circular reference error

sidepelican · May 26, 2021 · fd70656 · fd70656
1 parent 7e19342
commit fd70656
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Sources/PublisherBuilder/FlatMapExtension.swift b/Sources/PublisherBuilder/FlatMapExtension.swift
@@ -1,17 +1,17 @@
 import Combine
 
 extension Publisher {
-    public func flatMapBuild<O, P>(
-        @PublisherBuilder<O, Failure> _ builder: @escaping (Self.Output) -> P
+    public func flatMapBuild<O, F, P>(
+        @PublisherBuilder<O, F> _ builder: @escaping (Output) -> P
     ) -> Publishers.FlatMap<P, Self>
-    where O == P.Output, P: Publisher, P.Failure == Failure
+    where O == P.Output, F == P.Failure, P: Publisher, P.Failure == Failure
     {
         flatMap(builder)
     }
 
     public func flatMapBuild<O, P>(
-        @PublisherBuilder<O, Never> _ builder: @escaping (Self.Output) -> P
-    ) -> Publishers.FlatMap<Publishers.SetFailureType<P, Self.Failure>, Self>
+        @PublisherBuilder<O, Never> _ builder: @escaping (Output) -> P
+    ) -> Publishers.FlatMap<Publishers.SetFailureType<P, Failure>, Self>
     where O == P.Output, P: Publisher, P.Failure == Never
     {
         if #available(macOS 11.0, iOS 14.0, *) {
@@ -24,7 +24,7 @@ extension Publisher {
 
 extension Publisher where Failure == Never {
     public func flatMapBuild<O, F, P>(
-        @PublisherBuilder<O, F> _ builder: @escaping (Self.Output) -> P
+        @PublisherBuilder<O, F> _ builder: @escaping (Output) -> P
     ) -> Publishers.FlatMap<P, Publishers.SetFailureType<Self, P.Failure>>
     where O == P.Output, F == P.Failure, P: Publisher
     {
@@ -36,7 +36,7 @@ extension Publisher where Failure == Never {
     }
 
     public func flatMapBuild<O, P>(
-        @PublisherBuilder<O, Never> _ builder: @escaping (Self.Output) -> P
+        @PublisherBuilder<O, Never> _ builder: @escaping (Output) -> P
     ) -> Publishers.FlatMap<P, Self>
     where O == P.Output, P: Publisher, P.Failure == Never
     {