Merge branch 'master' into property-lifetime

andersio · andersio · commit 10b7118c541e · 2016-08-29T13:00:01.000+02:00
# Conflicts:
#	ReactiveCocoa.xcodeproj/project.pbxproj
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "Carthage/Checkouts/Nimble"]
 	path = Carthage/Checkouts/Nimble
-	url = https://github.com/ikesyo/Nimble.git
+	url = https://github.com/norio-nomura/Nimble.git
 [submodule "Carthage/Checkouts/Quick"]
 	path = Carthage/Checkouts/Quick
-	url = https://github.com/ikesyo/Quick.git
+	url = https://github.com/norio-nomura/Quick.git
 [submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "antitypical/Result" "3.0.0-alpha.3"
+github "antitypical/Result" "3.0.0-alpha.4"
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
-github "jspahrsummers/xcconfigs" "1ef9763"
-github "ikesyo/Quick" "xcode8-beta6"
-github "ikesyo/Nimble" "swift3-beta-6"
+github "jspahrsummers/xcconfigs" "3d9d996"
+github "norio-nomura/Quick" "nn-swift-3-compatibility"
+github "norio-nomura/Nimble" "nn-swift-3-compatibility"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "ikesyo/Nimble" "4f38620db52b81eef4298492fed057247308b5d6"
-github "ikesyo/Quick" "e14bf151a4c864e6f144559e7b7c09bca0fd38c1"
-github "antitypical/Result" "3.0.0-alpha.3"
-github "jspahrsummers/xcconfigs" "1ef97639ffbe041da0b1392b2114fa19b922a7a1"
+github "norio-nomura/Nimble" "3d82a185b49e8fc9f40e7b72feeb279c778f0935"
+github "norio-nomura/Quick" "4a7f1d0a7db637c3ca15b8f198a516fbc5581f87"
+github "antitypical/Result" "3.0.0-alpha.4"
+github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 4f38620db52b81eef4298492fed057247308b5d6
+Subproject commit 3d82a185b49e8fc9f40e7b72feeb279c778f0935
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit e14bf151a4c864e6f144559e7b7c09bca0fd38c1
+Subproject commit 4a7f1d0a7db637c3ca15b8f198a516fbc5581f87
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit d78cac38657de99d85f8f1770b290d039721ef27
+Subproject commit cc1699dbd812c71bee7c44c8cbd75497713bc279
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
@@ -1 +1 @@
-Subproject commit 1ef97639ffbe041da0b1392b2114fa19b922a7a1
+Subproject commit 3d9d99634cae6d586e272543d527681283b33eb0
diff --git a/ReactiveCocoa.xcodeproj/project.pbxproj b/ReactiveCocoa.xcodeproj/project.pbxproj
@@ -2229,7 +2229,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = GitHub;
 				TargetAttributes = {
 					57A4D1AF1BA13D7A00F7D4B1 = {
diff --git a/ReactiveCocoa/Objective-C/RACCompoundDisposable.m b/ReactiveCocoa/Objective-C/RACCompoundDisposable.m
@@ -94,7 +94,7 @@ - (instancetype)initWithDisposables:(NSArray *)otherDisposables {
 
 	#if RACCompoundDisposableInlineCount
 	[otherDisposables enumerateObjectsUsingBlock:^(RACDisposable *disposable, NSUInteger index, BOOL *stop) {
-		_inlineDisposables[index] = disposable;
+		self->_inlineDisposables[index] = disposable;
 
 		// Stop after this iteration if we've reached the end of the inlined
 		// array.
diff --git a/ReactiveCocoa/Swift/Property.swift b/ReactiveCocoa/Swift/Property.swift
@@ -383,6 +383,7 @@ extension PropertyProtocol {
 /// its source outlives it too.
 public final class Property<Value>: PropertyProtocol {
 	private let sources: [AnyObject]
+	private let disposable: Disposable?
 
 	private let _value: () -> Value
 	private let _producer: () -> SignalProducer<Value, NoError>
@@ -412,6 +413,7 @@ public final class Property<Value>: PropertyProtocol {
 	///   - property: A value of the constant property.
 	public init(value: Value) {
 		sources = []
+		disposable = nil
 		_value = { value }
 		_producer = { SignalProducer(value: value) }
 		_signal = { Signal<Value, NoError>.empty }
@@ -423,6 +425,7 @@ public final class Property<Value>: PropertyProtocol {
 	///   - property: A property to be wrapped.
 	public init<P: PropertyProtocol>(_ property: P) where P.Value == Value {
 		sources = Property.capture(property)
+		disposable = nil
 		_value = { property.value }
 		_producer = { property.producer }
 		_signal = { property.signal }
@@ -499,29 +502,18 @@ public final class Property<Value>: PropertyProtocol {
 		// they see a consistent view of the `self.value`.
 		// https://github.com/ReactiveCocoa/ReactiveCocoa/pull/3042
 		let producer = unsafeProducer.replayLazily(upTo: 1)
-		
+
+		let atomic = Atomic<Value?>(nil)
+		disposable = producer.startWithNext { atomic.value = $0 }
+
 		// Verify that an initial is sent. This is friendlier than deadlocking
 		// in the event that one isn't.
-		var value: Value? = nil
-		let disposable = producer.start { event in
-			switch event {
-			case let .next(newValue):
-				value = newValue
-				
-			case .completed, .interrupted:
-				break
-				
-			case let .failed(error):
-				fatalError("Receive unexpected error from a producer of `NoError` type: \(error)")
-			}
-		}
-		guard value != nil else {
+		guard atomic.value != nil else {
 			fatalError("A producer promised to send at least one value. Received none.")
 		}
-		disposable.dispose()
 
 		self.sources = sources
-		_value = { producer.take(first: 1).single()!.value! }
+		_value = { atomic.value! }
 		_producer = { producer }
 		_signal = {
 			var extractedSignal: Signal<Value, NoError>!
@@ -530,6 +522,10 @@ public final class Property<Value>: PropertyProtocol {
 		}
 	}
 
+	deinit {
+		disposable?.dispose()
+	}
+
 	/// Inspect if `property` is an `AnyProperty` and has already captured its
 	/// sources using a closure. Returns that closure if it does. Otherwise,
 	/// returns a closure which captures `property`.
diff --git a/ReactiveCocoa/Swift/SignalProducer.swift b/ReactiveCocoa/Swift/SignalProducer.swift
@@ -1176,6 +1176,22 @@ extension SignalProducerProtocol where Error == NoError {
 	) -> SignalProducer<Value, NewError> {
 		return lift { $0.timeout(after: interval, raising: error, on: scheduler) }
 	}
+
+	/// Wait for completion of `self`, *then* forward all events from
+	/// `replacement`.
+	///
+	/// - note: All values sent from `self` are ignored.
+	///
+	/// - parameters:
+	///   - replacement: A producer to start when `self` completes.
+	///
+	/// - returns: A producer that sends events from `self` and then from
+	///            `replacement` when `self` completes.
+	public func then<U, NewError: Swift.Error>(_ replacement: SignalProducer<U, NewError>) -> SignalProducer<U, NewError> {
+		return self
+			.promoteErrors(NewError.self)
+			.then(replacement)
+	}
 }
 
 extension SignalProducerProtocol where Value: Equatable {
@@ -1576,6 +1592,22 @@ extension SignalProducerProtocol {
 		}
 	}
 
+	/// Wait for completion of `self`, *then* forward all events from
+	/// `replacement`. Any failure or interruption sent from `self` is
+	/// forwarded immediately, in which case `replacement` will not be started,
+	/// and none of its events will be be forwarded.
+	///
+	/// - note: All values sent from `self` are ignored.
+	///
+	/// - parameters:
+	///   - replacement: A producer to start when `self` completes.
+	///
+	/// - returns: A producer that sends events from `self` and then from
+	///            `replacement` when `self` completes.
+	public func then<U>(_ replacement: SignalProducer<U, NoError>) -> SignalProducer<U, Error> {
+		return self.then(replacement.promoteErrors(Error.self))
+	}
+
 	/// Start the producer, then block, waiting for the first value.
 	///
 	/// When a single value or error is sent, the returned `Result` will
diff --git a/ReactiveCocoaTests/Swift/SignalProducerSpec.swift b/ReactiveCocoaTests/Swift/SignalProducerSpec.swift
@@ -1667,6 +1667,27 @@ class SignalProducerSpec: QuickSpec {
 				subsequentObserver.sendCompleted()
 				expect(completed) == true
 			}
+
+			it("works with NoError and TestError") {
+				let producer: SignalProducer<Int, TestError> = SignalProducer<Int, NoError>.empty
+					.then(SignalProducer<Int, TestError>.empty)
+
+				_ = producer
+			}
+
+			it("works with TestError and NoError") {
+				let producer: SignalProducer<Int, TestError> = SignalProducer<Int, TestError>.empty
+					.then(SignalProducer<Int, NoError>.empty)
+
+				_ = producer
+			}
+
+			it("works with NoError and NoError") {
+				let producer: SignalProducer<Int, NoError> = SignalProducer<Int, NoError>.empty
+					.then(SignalProducer<Int, NoError>.empty)
+
+				_ = producer
+			}
 		}
 
 		describe("first") {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "antitypical/Result" "3.0.0-alpha.3"`
	`1`	`+github "antitypical/Result" "3.0.0-alpha.4"`