From 53cf63304bedfcc7f497c71a5663e63043e59f00 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 8 Mar 2023 07:31:51 -0800 Subject: [PATCH] fix merge conflicts --- .../Effects/Publisher.swift | 111 ++---------------- 1 file changed, 7 insertions(+), 104 deletions(-) diff --git a/Sources/ComposableArchitecture/Effects/Publisher.swift b/Sources/ComposableArchitecture/Effects/Publisher.swift index 0c4a0c1cfa96..78291216ab7f 100644 --- a/Sources/ComposableArchitecture/Effects/Publisher.swift +++ b/Sources/ComposableArchitecture/Effects/Publisher.swift @@ -88,28 +88,10 @@ extension EffectPublisher { /// /// - Parameter publisher: A publisher. @available( -<<<<<<< HEAD - *, deprecated, message: "Iterate over 'Publisher.values' in an 'Effect.run', instead." -======= - iOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - macOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - tvOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - watchOS, deprecated: 9999.0, + *, + deprecated, message: "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." ->>>>>>> navigation-beta ) public init(_ publisher: P) where P.Output == Output, P.Failure == Failure { self.operation = .publisher(publisher.eraseToAnyPublisher()) @@ -338,29 +320,9 @@ extension Publisher { /// /// - Returns: An effect that wraps `self`. @available( -<<<<<<< HEAD *, deprecated, - message: "Iterate over 'Publisher.values' in an 'Effect.run', instead." -======= - iOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - macOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - tvOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - watchOS, deprecated: 9999.0, message: "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." ->>>>>>> navigation-beta ) public func eraseToEffect() -> EffectPublisher { EffectPublisher(self) @@ -382,28 +344,9 @@ extension Publisher { /// - transform: A mapping function that converts `Output` to another type. /// - Returns: An effect that wraps `self` after mapping `Output` values. @available( -<<<<<<< HEAD - *, deprecated, message: "Iterate over 'Publisher.values' in an 'Effect.run', instead." -======= - iOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - macOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - tvOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - watchOS, deprecated: 9999.0, + *, deprecated, message: "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." ->>>>>>> navigation-beta ) public func eraseToEffect( _ transform: @escaping (Output) -> T @@ -435,32 +378,11 @@ extension Publisher { /// /// - Returns: An effect that wraps `self`. @available( -<<<<<<< HEAD - *, deprecated, message: "Iterate over 'Publisher.values' in an 'Effect.run', instead." - ) - public func catchToEffect() -> Effect> { -======= - iOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - macOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - tvOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - watchOS, deprecated: 9999.0, + *, deprecated, message: "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." ) - public func catchToEffect() -> EffectTask> { ->>>>>>> navigation-beta + public func catchToEffect() -> Effect> { self.catchToEffect { $0 } } @@ -480,28 +402,9 @@ extension Publisher { /// - transform: A mapping function that converts `Result` to another type. /// - Returns: An effect that wraps `self`. @available( -<<<<<<< HEAD - *, deprecated, message: "Iterate over 'Publisher.values' in an 'Effect.run', instead." -======= - iOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - macOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - tvOS, deprecated: 9999.0, - message: - "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." - ) - @available( - watchOS, deprecated: 9999.0, + *, deprecated, message: "Iterate over 'Publisher.values' in an 'EffectTask.run', instead, or use 'EffectTask.publisher'." ->>>>>>> navigation-beta ) public func catchToEffect( _ transform: @escaping (Result) -> T @@ -556,7 +459,7 @@ extension Publisher { @usableFromInline internal struct EffectPublisherWrapper: Publisher { - @usableFromInline typealias Output = Action + @usableFromInline typealias Output = Action let effect: EffectPublisher