Remove type alias for Xcode 12.5 compatibility (#371)

* Remove type alias

* Fix a few warnings

Author: stephencelis

Examples/CaseStudies/SwiftUICaseStudies/00-Core.swift

@@ -69,7 +69,6 @@ struct RootEnvironment {
   var fetchNumber: () -> Effect<Int, Never>
   var mainQueue: AnySchedulerOf<DispatchQueue>
   var numberFact: (Int) -> Effect<String, NumbersApiError>
-  var trivia: (Int) -> Effect<String, TriviaApiError>
   var userDidTakeScreenshot: Effect<Void, Never>
   var uuid: () -> UUID
   var webSocket: WebSocketClient
@@ -81,7 +80,6 @@ struct RootEnvironment {
     fetchNumber: liveFetchNumber,
     mainQueue: DispatchQueue.main.eraseToAnyScheduler(),
     numberFact: liveNumberFact(for:),
-    trivia: liveTrivia(for:),
     userDidTakeScreenshot: liveUserDidTakeScreenshot,
     uuid: UUID.init,
     webSocket: .live
@@ -145,7 +143,7 @@ let rootReducer = Reducer<RootState, RootAction, RootEnvironment>.combine(
     .pullback(
       state: \.effectsCancellation,
       action: /RootAction.effectsCancellation,
-      environment: { .init(mainQueue: $0.mainQueue, trivia: $0.trivia) }
+      environment: { .init(mainQueue: $0.mainQueue, numberFact: $0.numberFact) }
     ),
   episodesReducer
     .pullback(
@@ -271,7 +269,7 @@ func liveNumberFact(for n: Int) -> Effect<String, NumbersApiError> {
       Just("\(n) is a good number Brent")
         .delay(for: 1, scheduler: DispatchQueue.main)
     }
-    .mapError { _ in NumbersApiError() }
+    .setFailureType(to: NumbersApiError.self)
     .eraseToEffect()
 }
 
@@ -287,7 +285,7 @@ func liveTrivia(for n: Int) -> Effect<String, TriviaApiError> {
       Just("\(n) is a good number Brent")
         .delay(for: 1, scheduler: DispatchQueue.main)
     }
-    .mapError { _ in TriviaApiError() }
+    .setFailureType(to: TriviaApiError.self)
     .eraseToEffect()
 }
 

Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Cancellation.swift

@@ -25,14 +25,14 @@ enum EffectsCancellationAction: Equatable {
   case cancelButtonTapped
   case stepperChanged(Int)
   case triviaButtonTapped
-  case triviaResponse(Result<String, TriviaApiError>)
+  case triviaResponse(Result<String, NumbersApiError>)
 }
 
 struct TriviaApiError: Error, Equatable {}
 
 struct EffectsCancellationEnvironment {
   var mainQueue: AnySchedulerOf<DispatchQueue>
-  var trivia: (Int) -> Effect<String, TriviaApiError>
+  var numberFact: (Int) -> Effect<String, NumbersApiError>
 }
 
 // MARK: - Business logic
@@ -58,7 +58,7 @@ let effectsCancellationReducer = Reducer<
     state.currentTrivia = nil
     state.isTriviaRequestInFlight = true
 
-    return environment.trivia(state.count)
+    return environment.numberFact(state.count)
       .receive(on: environment.mainQueue)
       .catchToEffect()
       .map(EffectsCancellationAction.triviaResponse)
@@ -128,7 +128,7 @@ struct EffectsCancellation_Previews: PreviewProvider {
           reducer: effectsCancellationReducer,
           environment: EffectsCancellationEnvironment(
             mainQueue: DispatchQueue.main.eraseToAnyScheduler(),
-            trivia: liveTrivia(for:)
+            numberFact: liveNumberFact(for:)
           )
         )
       )

Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-CancellationTests.swift

@@ -13,7 +13,7 @@ class EffectsCancellationTests: XCTestCase {
       reducer: effectsCancellationReducer,
       environment: .init(
         mainQueue: self.scheduler.eraseToAnyScheduler(),
-        trivia: { n in Effect(value: "\(n) is a good number Brent") }
+        numberFact: { n in Effect(value: "\(n) is a good number Brent") }
       )
     )
 
@@ -43,7 +43,7 @@ class EffectsCancellationTests: XCTestCase {
       reducer: effectsCancellationReducer,
       environment: .init(
         mainQueue: self.scheduler.eraseToAnyScheduler(),
-        trivia: { _ in Fail(error: TriviaApiError()).eraseToEffect() }
+        numberFact: { _ in Fail(error: NumbersApiError()).eraseToEffect() }
       )
     )
 
@@ -54,7 +54,7 @@ class EffectsCancellationTests: XCTestCase {
       .do {
         self.scheduler.advance()
       },
-      .receive(.triviaResponse(.failure(TriviaApiError()))) {
+      .receive(.triviaResponse(.failure(NumbersApiError()))) {
         $0.isTriviaRequestInFlight = false
       }
     )
@@ -72,7 +72,7 @@ class EffectsCancellationTests: XCTestCase {
       reducer: effectsCancellationReducer,
       environment: .init(
         mainQueue: self.scheduler.eraseToAnyScheduler(),
-        trivia: { n in Effect(value: "\(n) is a good number Brent") }
+        numberFact: { n in Effect(value: "\(n) is a good number Brent") }
       )
     )
 
@@ -95,7 +95,7 @@ class EffectsCancellationTests: XCTestCase {
       reducer: effectsCancellationReducer,
       environment: .init(
         mainQueue: self.scheduler.eraseToAnyScheduler(),
-        trivia: { n in Effect(value: "\(n) is a good number Brent") }
+        numberFact: { n in Effect(value: "\(n) is a good number Brent") }
       )
     )
 

Sources/ComposableArchitecture/SwiftUI/WithViewStore.swift

@@ -111,8 +111,6 @@ extension WithViewStore: DynamicViewContent where State: Collection, Content: Dy
   /// from store state.
   @available(iOS 14, macOS 11, tvOS 14, watchOS 7, *)
   extension WithViewStore: Scene where Content: Scene {
-    public typealias Body = Content
-
     /// Initializes a structure that transforms a store into an observable view store in order to
     /// compute scenes from store state.