Clean up generic signatures (#1143)

Author: stephencelis

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Animations.swift

@@ -20,10 +20,10 @@ private let readMe = """
   """
 
 extension Effect where Failure == Never {
-  public static func keyFrames<S>(
+  public static func keyFrames<S: Scheduler>(
     values: [(output: Output, duration: S.SchedulerTimeType.Stride)],
     scheduler: S
-  ) -> Effect where S: Scheduler {
+  ) -> Self {
     .concatenate(
       values
         .enumerated()

Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ElmLikeSubscriptions.swift

@@ -12,7 +12,7 @@ private let readMe = """
 extension Reducer {
   static func subscriptions(
     _ subscriptions: @escaping (State, Environment) -> [AnyHashable: Effect<Action, Never>]
-  ) -> Reducer {
+  ) -> Self {
     var activeSubscriptions: [AnyHashable: Effect<Action, Never>] = [:]
 
     return Reducer { state, _, environment in

Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-Recursion.swift

@@ -15,11 +15,11 @@ private let readMe = """
 
 extension Reducer {
   static func recurse(
-    _ reducer: @escaping (Reducer, inout State, Action, Environment) -> Effect<Action, Never>
-  ) -> Reducer {
+    _ reducer: @escaping (Self, inout State, Action, Environment) -> Effect<Action, Never>
+  ) -> Self {
 
-    var `self`: Reducer!
-    self = Reducer { state, action, environment in
+    var `self`: Self!
+    self = Self { state, action, environment in
       reducer(self, &state, action, environment)
     }
     return self

Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ResuableOfflineDownloads/DownloadComponent.swift

@@ -52,7 +52,7 @@ extension Reducer {
     state: WritableKeyPath<State, DownloadComponentState<ID>>,
     action: CasePath<Action, DownloadComponentAction>,
     environment: @escaping (Environment) -> DownloadComponentEnvironment
-  ) -> Reducer {
+  ) -> Self {
     .combine(
       Reducer<DownloadComponentState<ID>, DownloadComponentAction, DownloadComponentEnvironment> {
         state, action, environment in

Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ReusableFavoriting.swift

@@ -20,7 +20,7 @@ private let readMe = """
 
 // MARK: - Favorite domain
 
-struct FavoriteState<ID>: Equatable, Identifiable where ID: Hashable {
+struct FavoriteState<ID: Hashable>: Equatable, Identifiable {
   var alert: AlertState<FavoriteAction>?
   let id: ID
   var isFavorite: Bool
@@ -38,7 +38,7 @@ struct FavoriteEnvironment<ID> {
 }
 
 /// A cancellation token that cancels in-flight favoriting requests.
-struct FavoriteCancelId<ID>: Hashable where ID: Hashable {
+struct FavoriteCancelId<ID: Hashable>: Hashable {
   var id: ID
 }
 
@@ -52,11 +52,11 @@ struct FavoriteError: Equatable, Error, Identifiable {
 
 extension Reducer {
   /// Enhances a reducer with favoriting logic.
-  func favorite<ID>(
+  func favorite<ID: Hashable>(
     state: WritableKeyPath<State, FavoriteState<ID>>,
     action: CasePath<Action, FavoriteAction>,
     environment: @escaping (Environment) -> FavoriteEnvironment<ID>
-  ) -> Reducer where ID: Hashable {
+  ) -> Self {
     .combine(
       self,
       Reducer<FavoriteState<ID>, FavoriteAction, FavoriteEnvironment> {
@@ -90,7 +90,7 @@ extension Reducer {
   }
 }
 
-struct FavoriteButton<ID>: View where ID: Hashable {
+struct FavoriteButton<ID: Hashable>: View {
   let store: Store<FavoriteState<ID>, FavoriteAction>
 
   var body: some View {

Examples/CaseStudies/SwiftUICaseStudies/Internal/UIViewRepresented.swift

@@ -1,6 +1,6 @@
 import SwiftUI
 
-struct UIViewRepresented<UIViewType>: UIViewRepresentable where UIViewType: UIView {
+struct UIViewRepresented<UIViewType: UIView>: UIViewRepresentable {
   let makeUIView: (Context) -> UIViewType
   let updateUIView: (UIViewType, Context) -> Void = { _, _ in }
 

Examples/CaseStudies/UIKitCaseStudies/Internal/UIViewRepresented.swift

@@ -1,6 +1,6 @@
 import SwiftUI
 
-struct UIViewRepresented<UIViewType>: UIViewRepresentable where UIViewType: UIView {
+struct UIViewRepresented<UIViewType: UIView>: UIViewRepresentable {
   let makeUIView: (Context) -> UIViewType
   let updateUIView: (UIViewType, Context) -> Void = { _, _ in }
 

Sources/ComposableArchitecture/Debugging/ReducerDebugging.swift

@@ -46,7 +46,7 @@ extension Reducer {
     environment toDebugEnvironment: @escaping (Environment) -> DebugEnvironment = { _ in
       DebugEnvironment()
     }
-  ) -> Reducer {
+  ) -> Self {
     self.debug(
       prefix,
       state: { $0 },
@@ -73,7 +73,7 @@ extension Reducer {
     environment toDebugEnvironment: @escaping (Environment) -> DebugEnvironment = { _ in
       DebugEnvironment()
     }
-  ) -> Reducer {
+  ) -> Self {
     self.debug(
       prefix,
       state: { _ in () },
@@ -104,7 +104,7 @@ extension Reducer {
     environment toDebugEnvironment: @escaping (Environment) -> DebugEnvironment = { _ in
       DebugEnvironment()
     }
-  ) -> Reducer {
+  ) -> Self {
     #if DEBUG
       return .init { state, action, environment in
         let previousState = toLocalState(state)

Sources/ComposableArchitecture/Effect.swift

@@ -41,9 +41,9 @@ public struct Effect<Output, Failure: Error>: Publisher {
     self.upstream = publisher.eraseToAnyPublisher()
   }
 
-  public func receive<S>(
+  public func receive<S: Combine.Subscriber>(
     subscriber: S
-  ) where S: Combine.Subscriber, Failure == S.Failure, Output == S.Input {
+  ) where S.Input == Output, S.Failure == Failure {
     self.upstream.subscribe(subscriber)
   }
 
@@ -71,7 +71,7 @@ public struct Effect<Output, Failure: Error>: Publisher {
 
   /// An effect that does nothing and completes immediately. Useful for situations where you must
   /// return an effect, but you don't need to do anything.
-  public static var none: Effect {
+  public static var none: Self {
     Empty(completeImmediately: true).eraseToEffect()
   }
 
@@ -109,7 +109,7 @@ public struct Effect<Output, Failure: Error>: Publisher {
   ///   used to feed it `Result<Output, Failure>` values.
   public static func future(
     _ attemptToFulfill: @escaping (@escaping (Result<Output, Failure>) -> Void) -> Void
-  ) -> Effect {
+  ) -> Self {
     Deferred { Future(attemptToFulfill) }.eraseToEffect()
   }
 
@@ -193,7 +193,7 @@ public struct Effect<Output, Failure: Error>: Publisher {
   ///
   /// - Parameter effects: A variadic list of effects.
   /// - Returns: A new effect
-  public static func concatenate(_ effects: Effect...) -> Effect {
+  public static func concatenate(_ effects: Self...) -> Self {
     .concatenate(effects)
   }
 
@@ -208,9 +208,7 @@ public struct Effect<Output, Failure: Error>: Publisher {
   ///
   /// - Parameter effects: A collection of effects.
   /// - Returns: A new effect
-  public static func concatenate<C: Collection>(
-    _ effects: C
-  ) -> Effect where C.Element == Effect {
+  public static func concatenate<C: Collection>(_ effects: C) -> Self where C.Element == Effect {
     guard let first = effects.first else { return .none }
 
     return
@@ -226,9 +224,7 @@ public struct Effect<Output, Failure: Error>: Publisher {
   ///
   /// - Parameter effects: A list of effects.
   /// - Returns: A new effect
-  public static func merge(
-    _ effects: Effect...
-  ) -> Effect {
+  public static func merge(_ effects: Self...) -> Self {
     .merge(effects)
   }
 
@@ -237,7 +233,7 @@ public struct Effect<Output, Failure: Error>: Publisher {
   ///
   /// - Parameter effects: A sequence of effects.
   /// - Returns: A new effect
-  public static func merge<S: Sequence>(_ effects: S) -> Effect where S.Element == Effect {
+  public static func merge<S: Sequence>(_ effects: S) -> Self where S.Element == Effect {
     Publishers.MergeMany(effects).eraseToEffect()
   }
 
@@ -246,7 +242,7 @@ public struct Effect<Output, Failure: Error>: Publisher {
   ///
   /// - Parameter work: A closure encapsulating some work to execute in the real world.
   /// - Returns: An effect.
-  public static func fireAndForget(_ work: @escaping () throws -> Void) -> Effect {
+  public static func fireAndForget(_ work: @escaping () throws -> Void) -> Self {
     // NB: Ideally we'd return a `Deferred` wrapping an `Empty(completeImmediately: true)`, but
     //     due to a bug in iOS 13.2 that publisher will never complete. The bug was fixed in
     //     iOS 13.3, but to remain compatible with iOS 13.2 and higher we need to do a little

Sources/ComposableArchitecture/Effects/Cancellation.swift

@@ -29,7 +29,7 @@ extension Effect {
   ///   - cancelInFlight: Determines if any in-flight effect with the same identifier should be
   ///     canceled before starting this new one.
   /// - Returns: A new effect that is capable of being canceled by an identifier.
-  public func cancellable(id: AnyHashable, cancelInFlight: Bool = false) -> Effect {
+  public func cancellable(id: AnyHashable, cancelInFlight: Bool = false) -> Self {
     Deferred {
       ()
         -> Publishers.HandleEvents<
@@ -83,7 +83,7 @@ extension Effect {
   ///   - cancelInFlight: Determines if any in-flight effect with the same identifier should be
   ///     canceled before starting this new one.
   /// - Returns: A new effect that is capable of being canceled by an identifier.
-  public func cancellable(id: Any.Type, cancelInFlight: Bool = false) -> Effect {
+  public func cancellable(id: Any.Type, cancelInFlight: Bool = false) -> Self {
     self.cancellable(id: ObjectIdentifier(id), cancelInFlight: cancelInFlight)
   }
 
@@ -92,7 +92,7 @@ extension Effect {
   /// - Parameter id: An effect identifier.
   /// - Returns: A new effect that will cancel any currently in-flight effect with the given
   ///   identifier.
-  public static func cancel(id: AnyHashable) -> Effect {
+  public static func cancel(id: AnyHashable) -> Self {
     .fireAndForget {
       cancellablesLock.sync {
         cancellationCancellables[.init(id: id)]?.forEach { $0.cancel() }
@@ -108,7 +108,7 @@ extension Effect {
   /// - Parameter id: A unique type identifying the effect.
   /// - Returns: A new effect that will cancel any currently in-flight effect with the given
   ///   identifier.
-  public static func cancel(id: Any.Type) -> Effect {
+  public static func cancel(id: Any.Type) -> Self {
     .cancel(id: ObjectIdentifier(id))
   }
 
@@ -117,7 +117,7 @@ extension Effect {
   /// - Parameter ids: An array of effect identifiers.
   /// - Returns: A new effect that will cancel any currently in-flight effects with the given
   ///   identifiers.
-  public static func cancel(ids: [AnyHashable]) -> Effect {
+  public static func cancel(ids: [AnyHashable]) -> Self {
     .merge(ids.map(Effect.cancel(id:)))
   }
 
@@ -129,7 +129,7 @@ extension Effect {
   /// - Parameter ids: An array of unique types identifying the effects.
   /// - Returns: A new effect that will cancel any currently in-flight effects with the given
   ///   identifiers.
-  public static func cancel(ids: [Any.Type]) -> Effect {
+  public static func cancel(ids: [Any.Type]) -> Self {
     .merge(ids.map(Effect.cancel(id:)))
   }
 }