Removing Result in favor of Swift.Result (#702)

* Removed Result

* Removing Result from project

* Added NoError and ResultProtocol for Swift.Result

* Using Swift.Error in lieu of AnyError

* Replaced NoError with Never

* Test fixes

* Specify the correct Error type in Never overloads

* Fix tests

* Update SwiftPM

* Update CI

* Remove the last vestiges of Result.framework

* Rename assumeNevers back to assumeNoErrors

Author: NachoSoto

.gitmodules

@@ -7,6 +7,3 @@
 [submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
-[submodule "Carthage/Checkouts/Result"]
-	path = Carthage/Checkouts/Result
-	url = https://github.com/antitypical/Result.git

.swift-version

@@ -1 +1 @@
-4.2.1
+5.0

.travis.yml

@@ -1,6 +1,6 @@
 os: osx
 language: objective-c
-osx_image: xcode10.1
+osx_image: xcode10.2
 before_install: true
 install: true
 branches:
@@ -68,25 +68,10 @@ aliases:
 matrix:
   include:
     - <<: *xcode
-    - <<: *xcode
-      osx_image: xcode10.2
-    # - <<: *xcode
-    #   osx_image: xcode10.2
-    #   env: XCODE_ARGS="SWIFT_VERSION=5.0"
     - <<: *cocoapods
       install: gem update cocoapods
     - <<: *swiftpm_darwin
-    - <<: *swiftpm_darwin
-      osx_image: xcode10.2
-    - <<: *swiftpm_linux
     - <<: *swiftpm_linux
-      env:
-        - JOB=SwiftPM
-        - SWIFT_VERSION=4.2.3
-    - <<: *swiftpm_linux
-      env:
-        - JOB=SwiftPM
-        - SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a
     - stage: carthage
       script: carthage build --cache-builds --no-skip-current
     - stage: deploy

Cartfile

@@ -1 +0,0 @@
-github "antitypical/Result" ~> 4.1

Cartfile.resolved

@@ -1,4 +1,3 @@
 github "Quick/Nimble" "v8.0.0"
 github "Quick/Quick" "v2.0.0"
-github "antitypical/Result" "4.1.0"
 github "jspahrsummers/xcconfigs" "0.12"

Carthage/Checkouts/Result

@@ -18,15 +18,6 @@
           "revision": "0b4ed6c706dd0cce923b5019a605a9bcc6b1b600",
           "version": "2.0.0"
         }
-      },
-      {
-        "package": "Result",
-        "repositoryURL": "https://github.com/antitypical/Result.git",
-        "state": {
-          "branch": null,
-          "revision": "2ca499ba456795616fbc471561ff1d963e6ae160",
-          "version": "4.1.0"
-        }
       }
     ]
   },

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 import PackageDescription
 
 let package = Package(
@@ -7,13 +7,12 @@ let package = Package(
         .library(name: "ReactiveSwift", targets: ["ReactiveSwift"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"),
         .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
         .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
     ],
     targets: [
-        .target(name: "ReactiveSwift", dependencies: ["Result"], path: "Sources"),
+        .target(name: "ReactiveSwift", dependencies: [], path: "Sources"),
         .testTarget(name: "ReactiveSwiftTests", dependencies: ["ReactiveSwift", "Quick", "Nimble"]),
     ],
-    swiftLanguageVersions: [4]
+    swiftLanguageVersions: [.v5]
 )

Package.swift

@@ -75,7 +75,7 @@ ReactiveSwift to your `Cartfile`:
 github "ReactiveCocoa/ReactiveSwift" ~> 5.0
 ```
 
-If you use Carthage to build your dependencies, make sure you have added `ReactiveSwift.framework`, and `Result.framework` to the "_Linked Frameworks and Libraries_" section of your target, and have included them in your Carthage framework copying build phase.
+If you use Carthage to build your dependencies, make sure you have added `ReactiveSwift.framework` to the "_Linked Frameworks and Libraries_" section of your target, and have included them in your Carthage framework copying build phase.
 
 #### CocoaPods
 
@@ -100,12 +100,10 @@ of your package in `Package.swift`:
  1. Add the ReactiveSwift repository as a [submodule][] of your
     application’s repository.
  1. Run `git submodule update --init --recursive` from within the ReactiveCocoa folder.
- 1. Drag and drop `ReactiveSwift.xcodeproj` and
-    `Carthage/Checkouts/Result/Result.xcodeproj` into your application’s Xcode
+ 1. Drag and drop `ReactiveSwift.xcodeproj` into your application’s Xcode
     project or workspace.
  1. On the “General” tab of your application target’s settings, add
-    `ReactiveSwift.framework`, and `Result.framework`
-    to the “Embedded Binaries” section.
+    `ReactiveSwift.framework` to the “Embedded Binaries” section.
  1. If your application target does not contain Swift code at all, you should also
     set the `EMBEDDED_CONTENT_CONTAINS_SWIFT` build setting to “Yes”.
 

Package@swift-4.2.swift

@@ -13,7 +13,6 @@
  1. If you cannot see the playground live view, make sure the Timeline view has been selected for the Assistant Editor.
  */
 import ReactiveSwift
-import Result
 import UIKit
 import PlaygroundSupport
 
@@ -32,7 +31,7 @@ final class ViewModel {
 
 	let submit: Action<(), (), FormError>
 
-	let reasons: Signal<String, NoError>
+	let reasons: Signal<String, Never>
 
 	init(userService: UserService) {
         // email: ValidatingProperty<String, FormError>
@@ -127,9 +126,9 @@ final class ViewController: UIViewController {
 }
 
 final class UserService {
-	let (requestSignal, requestObserver) = Signal<String, NoError>.pipe()
+	let (requestSignal, requestObserver) = Signal<String, Never>.pipe()
 
-	func canUseUsername(_ string: String) -> SignalProducer<Bool, NoError> {
+	func canUseUsername(_ string: String) -> SignalProducer<Bool, Never> {
 		return SignalProducer { observer, disposable in
 			self.requestObserver.send(value: string)
 			observer.send(value: true)

README.md

@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 import ReactiveSwift
-import Result
 
 public class FormView: UIView {
 	let _lifetime = Lifetime.Token()

ReactiveSwift-UIExamples.playground/Pages/ValidatingProperty.xcplaygroundpage/Contents.swift

@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 import ReactiveSwift
-import enum Result.NoError
 
 // These extensions mimics the ReactiveCocoa API, but not in a complete way.
 //
@@ -62,7 +61,7 @@ extension Reactive where Base: UILabel {
 }
 
 extension Reactive where Base: UISwitch {
-	public var isOnValues: Signal<Bool, NoError> {
+	public var isOnValues: Signal<Bool, Never> {
 		return Signal { observer, lifetime in
 			let target = CocoaTarget { observer.send(value: ($0 as! UISwitch).isOn) }
 			base.addTarget(target, action: #selector(target.execute), for: .valueChanged)
@@ -72,7 +71,7 @@ extension Reactive where Base: UISwitch {
 }
 
 extension Reactive where Base: UITextField {
-	public var continuousTextValues: Signal<String?, NoError> {
+	public var continuousTextValues: Signal<String?, Never> {
 		return Signal { observer, lifetime in
 			let target = CocoaTarget { observer.send(value: ($0 as! UITextField).text) }
 			base.addTarget(target, action: #selector(target.execute), for: .editingChanged)

ReactiveSwift-UIExamples.playground/Pages/ValidatingProperty.xcplaygroundpage/Sources/FormView.swift

@@ -11,7 +11,6 @@
  1. Finally open the `ReactiveSwift.playground`
  1. Choose `View > Show Debug Area`
  */
-import Result
 import ReactiveSwift
 import Foundation
 /*:
@@ -77,7 +76,7 @@ scopedExample("Creation") {
  property’s value is updated whenever the source property is updated.
  */
 scopedExample("Binding from SignalProducer") {
-    let producer = SignalProducer<Int, NoError> { observer, _ in
+    let producer = SignalProducer<Int, Never> { observer, _ in
         print("New subscription, starting operation")
         observer.send(value: 1)
         observer.send(value: 2)
@@ -92,7 +91,7 @@ scopedExample("Binding from SignalProducer") {
 }
 
 scopedExample("Binding from Signal") {
-    let (signal, observer) = Signal<Int, NoError>.pipe()
+    let (signal, observer) = Signal<Int, Never>.pipe()
     let property = MutableProperty(0)
     property.producer.startWithValues {
         print("Property received \($0)")

ReactiveSwift-UIExamples.playground/Pages/ValidatingProperty.xcplaygroundpage/Sources/UIKitExtensions.swift

@@ -12,7 +12,6 @@
  1. Choose `View > Show Debug Area`
  */
 
-import Result
 import ReactiveSwift
 import Foundation
 

ReactiveSwift.playground/Pages/Property.xcplaygroundpage/Contents.swift

@@ -12,7 +12,6 @@
 1. Choose `View > Show Debug Area`
 */
 
-import Result
 import ReactiveSwift
 import Foundation
 
@@ -53,10 +52,10 @@ Furthermore, the subscription to a signal does not trigger any side effects
 */
 scopedExample("Subscription") {
 	// Signal.pipe is a way to manually control a signal. the returned observer can be used to send values to the signal
-	let (signal, observer) = Signal<Int, NoError>.pipe()
+	let (signal, observer) = Signal<Int, Never>.pipe()
 
-	let subscriber1 = Signal<Int, NoError>.Observer(value: { print("Subscriber 1 received \($0)") } )
-	let subscriber2 = Signal<Int, NoError>.Observer(value: { print("Subscriber 2 received \($0)") } )
+	let subscriber1 = Signal<Int, Never>.Observer(value: { print("Subscriber 1 received \($0)") } )
+	let subscriber2 = Signal<Int, Never>.Observer(value: { print("Subscriber 2 received \($0)") } )
 
 	print("Subscriber 1 subscribes to the signal")
 	signal.observe(subscriber1)
@@ -79,9 +78,9 @@ scopedExample("Subscription") {
 A Signal that completes immediately without emitting any value.
 */
 scopedExample("`empty`") {
-	let emptySignal = Signal<Int, NoError>.empty
+	let emptySignal = Signal<Int, Never>.empty
 
-	let observer = Signal<Int, NoError>.Observer(
+	let observer = Signal<Int, Never>.Observer(
 		value: { _ in print("value not called") },
 		failed: { _ in print("error not called") },
 		completed: { print("completed not called") },
@@ -96,9 +95,9 @@ scopedExample("`empty`") {
 A Signal that never sends any events to its observers.
 */
 scopedExample("`never`") {
-	let neverSignal = Signal<Int, NoError>.never
+	let neverSignal = Signal<Int, Never>.never
 
-	let observer = Signal<Int, NoError>.Observer(
+	let observer = Signal<Int, Never>.Observer(
 		value: { _ in print("value not called") },
 		failed: { _ in print("error not called") },
 		completed: { print("completed not called") },
@@ -119,8 +118,8 @@ a function that returns a unique value for each sent value can help you reduce
 the memory footprint.
 */
 scopedExample("`uniqueValues`") {
-	let (signal, observer) = Signal<Int, NoError>.pipe()
-	let subscriber = Signal<Int, NoError>.Observer(value: { print("Subscriber received \($0)") } )
+	let (signal, observer) = Signal<Int, Never>.pipe()
+	let subscriber = Signal<Int, Never>.Observer(value: { print("Subscriber received \($0)") } )
 	let uniqueSignal = signal.uniqueValues()
 
 	uniqueSignal.observe(subscriber)
@@ -138,8 +137,8 @@ scopedExample("`uniqueValues`") {
 Maps each value in the signal to a new value.
 */
 scopedExample("`map`") {
-	let (signal, observer) = Signal<Int, NoError>.pipe()
-	let subscriber = Signal<Int, NoError>.Observer(value: { print("Subscriber received \($0)") } )
+	let (signal, observer) = Signal<Int, Never>.pipe()
+	let subscriber = Signal<Int, Never>.Observer(value: { print("Subscriber received \($0)") } )
 	let mappedSignal = signal.map { $0 * 2 }
 
 	mappedSignal.observe(subscriber)
@@ -171,8 +170,8 @@ scopedExample("`mapError`") {
 Preserves only the values of the signal that pass the given predicate.
 */
 scopedExample("`filter`") {
-	let (signal, observer) = Signal<Int, NoError>.pipe()
-	let subscriber = Signal<Int, NoError>.Observer(value: { print("Subscriber received \($0)") } )
+	let (signal, observer) = Signal<Int, Never>.pipe()
+	let subscriber = Signal<Int, Never>.Observer(value: { print("Subscriber received \($0)") } )
 	// subscriber will only receive events with values greater than 12
 	let filteredSignal = signal.filter { $0 > 12 }
 
@@ -190,10 +189,10 @@ Unwraps non-`nil` values and forwards them on the returned signal, `nil`
 values are dropped.
 */
 scopedExample("`skipNil`") {
-	let (signal, observer) = Signal<Int?, NoError>.pipe()
+	let (signal, observer) = Signal<Int?, Never>.pipe()
 	// note that the signal is of type `Int?` and observer is of type `Int`, given we're unwrapping
 	// non-`nil` values
-	let subscriber = Signal<Int, NoError>.Observer(value: { print("Subscriber received \($0)") } )
+	let subscriber = Signal<Int, Never>.Observer(value: { print("Subscriber received \($0)") } )
 	let skipNilSignal = signal.skipNil()
 
 	skipNilSignal.observe(subscriber)
@@ -207,8 +206,8 @@ scopedExample("`skipNil`") {
 Returns a signal that will yield the first `count` values from `self`
 */
 scopedExample("`take(first:)`") {
-	let (signal, observer) = Signal<Int, NoError>.pipe()
-	let subscriber = Signal<Int, NoError>.Observer(value: { print("Subscriber received \($0)") } )
+	let (signal, observer) = Signal<Int, Never>.pipe()
+	let subscriber = Signal<Int, Never>.Observer(value: { print("Subscriber received \($0)") } )
 	let takeSignal = signal.take(first: 2)
 
 	takeSignal.observe(subscriber)
@@ -225,10 +224,10 @@ Returns a signal that will yield an array of values when `self` completes.
 an empty array of values.
 */
 scopedExample("`collect`") {
-	let (signal, observer) = Signal<Int, NoError>.pipe()
+	let (signal, observer) = Signal<Int, Never>.pipe()
 	// note that the signal is of type `Int` and observer is of type `[Int]` given we're "collecting"
 	// `Int` values for the lifetime of the signal
-	let subscriber = Signal<[Int], NoError>.Observer(value: { print("Subscriber received \($0)") } )
+	let subscriber = Signal<[Int], Never>.Observer(value: { print("Subscriber received \($0)") } )
 	let collectSignal = signal.collect()
 
 	collectSignal.observe(subscriber)