RACCommunity · neilpa · Oct 25, 2015 · Oct 23, 2015 · Oct 23, 2015 · Oct 23, 2015
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"
diff --git a/Cartfile.resolved b/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"
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
diff --git a/Source/AppKit/NSTextField.swift b/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)

diff --git a/Source/Foundation/Association.swift b/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!
 }
diff --git a/Source/Foundation/NSData.swift b/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)
             }
         }
     }

diff --git a/Source/Signal.swift b/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:

diff --git a/Source/SignalProducer.swift b/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()

diff --git a/Tests/SignalTests.swift b/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)
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
		github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"
+10 −4		CHANGELOG.md
+1 −1		Cartfile
+1 −1		Cartfile.resolved
+1 −1		Carthage/Checkouts/Result
+30 −30		Documentation/BasicOperators.md
+20 −23		Documentation/DesignGuidelines.md
+5 −5		Documentation/FrameworkOverview.md
+12 −12		README.md
+40 −16		ReactiveCocoa.xcodeproj/project.pbxproj
+2 −2		ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-Mac.xcscheme
+2 −2		ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-iOS.xcscheme
+80 −0		ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-tvOS.xcscheme
+4 −4		ReactiveCocoa/Swift/Action.swift
+19 −19		ReactiveCocoa/Swift/Event.swift
+1 −1		ReactiveCocoa/Swift/FoundationExtensions.swift
+5 −5		ReactiveCocoa/Swift/ObjectiveCBridging.swift
+8 −8		ReactiveCocoa/Swift/Observer.swift
+53 −53		ReactiveCocoa/Swift/Signal.swift
+34 −34		ReactiveCocoa/Swift/SignalProducer.swift
+3 −3		ReactiveCocoaTests/Swift/ActionSpec.swift
+2 −2		ReactiveCocoaTests/Swift/ObjectiveCBridgingSpec.swift
+16 −16		ReactiveCocoaTests/Swift/SignalProducerLiftingSpec.swift
+1 −1		ReactiveCocoaTests/Swift/SignalProducerNimbleMatchers.swift
+16 −16		ReactiveCocoaTests/Swift/SignalProducerSpec.swift
+21 −21		ReactiveCocoaTests/Swift/SignalSpec.swift
+10 −0		.travis.yml
+23 −0		CONTRIBUTING.md
+1 −0		README.md
+1 −1		Result.podspec
+14 −0		Result.xcodeproj/project.pbxproj
+99 −0		Result.xcodeproj/xcshareddata/xcschemes/Result-tvOS.xcscheme
+1 −26		Result/Result.swift
+52 −3		Result/ResultType.swift
+2 −2		ResultTests/ResultTests.swift