Merge pull request #56 from neilpa/rac4-alpha3

Update RAC to 4.0-alpha.3

Cartfile

@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "antitypical/Result" "0.6.0-beta.3"
-github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
+github "antitypical/Result" "0.6.0-beta.5"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"

Source/AppKit/NSTextField.swift

@@ -11,7 +11,7 @@ import ReactiveCocoa
 import AppKit
 
 extension NSTextField {
-    /// only changes from UI will be produced here
+    /// Sends the field's string value whenever it changes.
     public var rex_textSignal: SignalProducer<String, NoError> {
         return NSNotificationCenter.defaultCenter()
             .rac_notifications(NSControlTextDidChangeNotification, object: self)

Source/Foundation/Association.swift

@@ -74,7 +74,6 @@ public func associatedObject<T: AnyObject>(host: AnyObject, key: UnsafePointer<(
     if value == nil {
         value = initial()
         objc_setAssociatedObject(host, key, value, .OBJC_ASSOCIATION_RETAIN)
-//        objc_setAssociatedObject(host, key, value, objc_AssociationPolicy())
     }
     return value!
 }

Source/Foundation/NSData.swift

@@ -19,7 +19,7 @@ extension NSData {
                 observer.sendNext(data)
                 observer.sendCompleted()
             } catch {
-                observer.sendError(error as NSError)
+                observer.sendFailed(error as NSError)
             }
         }
     }

Source/Signal.swift

@@ -18,8 +18,8 @@ extension SignalType {
                 if let val = transform(value) {
                     observer.sendNext(val)
                 }
-            }, error: { error in
-                observer.sendError(error)
+            }, failed: { error in
+                observer.sendFailed(error)
             }, completed: {
                 observer.sendCompleted()
             }, interrupted: {
@@ -38,7 +38,7 @@ extension SignalType {
                 switch event {
                 case let .Next(value):
                     observer.sendNext(value)
-                case .Error:
+                case .Failed:
                     observer.action(replacement)
                 case .Completed:
                     observer.sendCompleted()
@@ -80,8 +80,8 @@ extension SignalType where Value: SequenceType {
                 switch event {
                 case let .Next(sequence):
                     sequence.forEach { observer.sendNext($0) }
-                case let .Error(error):
-                    observer.sendError(error)
+                case let .Failed(error):
+                    observer.sendFailed(error)
                 case .Completed:
                     observer.sendCompleted()
                 case .Interrupted:

Source/SignalProducer.swift

@@ -36,9 +36,9 @@ extension SignalProducerType {
 
                 group!.sendNext(value)
 
-            }, error: { error in
-                observer.sendError(error)
-                groups.values.forEach { $0.sendError(error) }
+            }, failed: { error in
+                observer.sendFailed(error)
+                groups.values.forEach { $0.sendFailed(error) }
 
             }, completed: { _ in
                 observer.sendCompleted()

Tests/SignalTests.swift

@@ -48,7 +48,7 @@ final class SignalTests: XCTestCase {
         sink.sendNext(1)
         XCTAssertFalse(completed)
 
-        sink.sendError(.Default)
+        sink.sendFailed(.Default)
         XCTAssertTrue(completed)
     }
 
@@ -65,7 +65,7 @@ final class SignalTests: XCTestCase {
         sink.sendNext(1)
         XCTAssertFalse(interrupted)
 
-        sink.sendError(.Default)
+        sink.sendFailed(.Default)
         XCTAssertTrue(interrupted)
     }