Fix the remaining build errors in ObjectiveCBridging.swift for Xcode 8 beta 6

Looks like SE-0112 and SE-0116 are related to this.

Author: ikesyo

ReactiveCocoa/Swift/ObjectiveCBridging.swift

@@ -102,7 +102,7 @@ extension RACSignal {
 	///   - line: Current line in file.
 	///
 	/// - returns: Signal producer created from `self`.
-	public func toSignalProducer(file: String = #file, line: Int = #line) -> SignalProducer<AnyObject?, NSError> {
+	public func toSignalProducer(file: String = #file, line: Int = #line) -> SignalProducer<Any?, NSError> {
 		return SignalProducer { observer, disposable in
 			let next = { obj in
 				observer.sendNext(obj)
@@ -121,65 +121,19 @@ extension RACSignal {
 	}
 }
 
-extension SignalProducerProtocol where Value: AnyObject {
+extension SignalProducerProtocol {
 	/// Create a `RACSignal` that will `start()` the producer once for each
 	/// subscription.
 	///
 	/// - note: Any `interrupted` events will be silently discarded.
 	///
 	/// - returns: `RACSignal` instantiated from `self`.
 	public func toRACSignal() -> RACSignal {
-		return self
-			.lift { $0.optionalize() }
-			.toRACSignal()
-	}
-}
-
-extension SignalProducerProtocol where Value: OptionalProtocol, Value.Wrapped: AnyObject {
-	/// Create a `RACSignal` that will `start()` the producer once for each
-	/// subscription.
-	///
-	/// - note: Any `interrupted` events will be silently discarded.
-	///
-	/// - returns: `RACSignal` instantiated from `self`.
-	public func toRACSignal() -> RACSignal {
-		return self
-			.mapError { $0 as NSError }
-			.toRACSignal()
-	}
-}
-
-extension SignalProducerProtocol where Value: AnyObject, Error: NSError {
-	/// Create a `RACSignal` that will `start()` the producer once for each
-	/// subscription.
-	///
-	/// - note: Any `interrupted` events will be silently discarded.
-	///
-	/// - returns: `RACSignal` instantiated from `self`.
-	public func toRACSignal() -> RACSignal {
-		return self
-			.lift { $0.optionalize() }
-			.toRACSignal()
-	}
-}
-
-extension SignalProducerProtocol where Value: OptionalProtocol, Value.Wrapped: AnyObject, Error: NSError {
-	/// Create a `RACSignal` that will `start()` the producer once for each
-	/// subscription.
-	///
-	/// - note: Any `interrupted` events will be silently discarded.
-	///
-	/// - returns: `RACSignal` instantiated from `self`.
-	public func toRACSignal() -> RACSignal {
-		// This special casing of `Error: NSError` is a workaround for
-		// rdar://22708537 which causes an NSError's UserInfo dictionary to get
-		// discarded during a cast from ErrorType to NSError in a generic
-		// function
 		return RACSignal.createSignal { subscriber in
 			let selfDisposable = self.start { event in
 				switch event {
 				case let .next(value):
-					subscriber.sendNext(value.optional)
+					subscriber.sendNext(value)
 				case let .failed(error):
 					subscriber.sendError(error)
 				case .completed:
@@ -196,61 +150,18 @@ extension SignalProducerProtocol where Value: OptionalProtocol, Value.Wrapped: A
 	}
 }
 
-extension SignalProtocol where Value: AnyObject {
-	/// Create a `RACSignal` that will observe the given signal.
-	///
-	/// - note: Any `interrupted` events will be silently discarded.
-	///
-	/// - returns: `RACSignal` instantiated from `self`.
-	public func toRACSignal() -> RACSignal {
-		return self
-			.optionalize()
-			.toRACSignal()
-	}
-}
-
-extension SignalProtocol where Value: AnyObject, Error: NSError {
+extension SignalProtocol {
 	/// Create a `RACSignal` that will observe the given signal.
 	///
 	/// - note: Any `interrupted` events will be silently discarded.
 	///
 	/// - returns: `RACSignal` instantiated from `self`.
 	public func toRACSignal() -> RACSignal {
-		return self
-			.optionalize()
-			.toRACSignal()
-	}
-}
-
-extension SignalProtocol where Value: OptionalProtocol, Value.Wrapped: AnyObject {
-	/// Create a `RACSignal` that will observe the given signal.
-	///
-	/// - note: Any `interrupted` events will be silently discarded.
-	///
-	/// - returns: `RACSignal` instantiated from `self`.
-	public func toRACSignal() -> RACSignal {
-		return self
-			.mapError { $0 as NSError }
-			.toRACSignal()
-	}
-}
-
-extension SignalProtocol where Value: OptionalProtocol, Value.Wrapped: AnyObject, Error: NSError {
-	/// Create a `RACSignal` that will observe the given signal.
-	///
-	/// - note: Any `interrupted` events will be silently discarded.
-	///
-	/// - returns: `RACSignal` instantiated from `self`.
-	public func toRACSignal() -> RACSignal {
-		// This special casing of `Error: NSError` is a workaround for
-		// rdar://22708537 which causes an NSError's UserInfo dictionary to get
-		// discarded during a cast from ErrorType to NSError in a generic
-		// function
 		return RACSignal.createSignal { subscriber in
 			let selfDisposable = self.observe { event in
 				switch event {
 				case let .next(value):
-					subscriber.sendNext(value.optional)
+					subscriber.sendNext(value)
 				case let .failed(error):
 					subscriber.sendError(error)
 				case .completed:
@@ -285,14 +196,14 @@ extension RACCommand {
 	///   - line: Current line in file.
 	///
 	/// - returns: Action created from `self`.
-	public func toAction(file: String = #file, line: Int = #line) -> Action<AnyObject?, AnyObject?, NSError> {
+	public func toAction(file: String = #file, line: Int = #line) -> Action<Any?, Any?, NSError> {
 		let enabledProperty = MutableProperty(true)
 
 		enabledProperty <~ self.enabled.toSignalProducer()
 			.map { $0 as! Bool }
 			.flatMapError { _ in SignalProducer<Bool, NoError>(value: false) }
 
-		return Action(enabledIf: enabledProperty) { input -> SignalProducer<AnyObject?, NSError> in
+		return Action(enabledIf: enabledProperty) { input -> SignalProducer<Any?, NSError> in
 			let executionSignal = RACSignal.`defer` {
 				return self.execute(input)
 			}
@@ -318,58 +229,24 @@ extension ActionProtocol {
 ///   - line: Current line in file.
 ///
 /// - returns: Action created from `self`.
-public func bridgedAction<Input>(from command: RACCommand<Input>, file: String = #file, line: Int = #line) -> Action<AnyObject?, AnyObject?, NSError> {
+public func bridgedAction<Input>(from command: RACCommand<Input>, file: String = #file, line: Int = #line) -> Action<Any?, Any?, NSError> {
 	let command = command as! RACCommand<AnyObject>
 	let enabledProperty = MutableProperty(true)
 
 	enabledProperty <~ command.enabled.toSignalProducer()
 		.map { $0 as! Bool }
 		.flatMapError { _ in SignalProducer<Bool, NoError>(value: false) }
 
-	return Action(enabledIf: enabledProperty) { input -> SignalProducer<AnyObject?, NSError> in
+	return Action(enabledIf: enabledProperty) { input -> SignalProducer<Any?, NSError> in
 		let executionSignal = RACSignal.`defer` {
-			return command.execute(input)
+			return command.execute(input as AnyObject?)
 		}
 
 		return executionSignal.toSignalProducer(file: file, line: line)
 	}
 }
 
-extension ActionProtocol where Input: AnyObject, Output: AnyObject {
-	/// Creates a RACCommand that will execute the action.
-	///
-	/// - note: The returned command will not necessarily be marked as executing
-	///         when the action is. However, the reverse is always true: the Action
-	///         will always be marked as executing when the RACCommand is.
-	///
-	/// - returns: `RACCommand` with bound action.
-	public func toRACCommand() -> RACCommand<Input> {
-		return RACCommand<Input>(enabled: action.isCommandEnabled) { input -> RACSignal in
-			return self
-				.apply(input!)
-				.toRACSignal()
-		}
-	}
-}
-
-extension ActionProtocol where Input: OptionalProtocol, Input.Wrapped: AnyObject, Output: AnyObject {
-	/// Creates a RACCommand that will execute the action.
-	///
-	/// - note: The returned command will not necessarily be marked as executing
-	///         when the action is. However, the reverse is always true: the Action
-	///         will always be marked as executing when the RACCommand is.
-	///
-	/// - returns: `RACCommand` with bound action.
-	public func toRACCommand() -> RACCommand<Input.Wrapped> {
-		return RACCommand<Input.Wrapped>(enabled: action.isCommandEnabled) { input -> RACSignal in
-			return self
-				.apply(Input(reconstructing: input))
-				.toRACSignal()
-		}
-	}
-}
-
-extension ActionProtocol where Input: AnyObject, Output: OptionalProtocol, Output.Wrapped: AnyObject {
+extension ActionProtocol where Input: AnyObject {
 	/// Creates a RACCommand that will execute the action.
 	///
 	/// - note: The returned command will not necessarily be marked as executing
@@ -386,7 +263,7 @@ extension ActionProtocol where Input: AnyObject, Output: OptionalProtocol, Outpu
 	}
 }
 
-extension ActionProtocol where Input: OptionalProtocol, Input.Wrapped: AnyObject, Output: OptionalProtocol, Output.Wrapped: AnyObject {
+extension ActionProtocol where Input: OptionalProtocol, Input.Wrapped: AnyObject {
 	/// Creates a RACCommand that will execute the action.
 	///
 	/// - note: The returned command will not necessarily be marked as executing