Merge upstream changes

mattprowse · mattprowse · commit 009d3f27175e · 2015-08-07T10:54:44.000+10:00
diff --git a/ReactiveTask/Task.swift b/ReactiveTask/Task.swift
@@ -504,7 +504,7 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE
 							disposable += stdoutAggregated
 								.then(stderrAggregated)
 								.flatMap(.Concat) { data in
-									let errorString = (data.length > 0 ? String(UTF8String: UnsafePointer<CChar>(data.bytes)) : nil)
+									let errorString = (data.length > 0 ? NSString(data: data, encoding: NSUTF8StringEncoding) as? String : nil)
 									return SignalProducer(error: .ShellTaskFailed(exitCode: terminationStatus, standardError: errorString))
 								}
 								.start(observer)

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE`
`504`	`504`	`disposable += stdoutAggregated`
`505`	`505`	`.then(stderrAggregated)`
`506`	`506`	`.flatMap(.Concat) { data in`
`507`		`- let errorString = (data.length > 0 ? String(UTF8String: UnsafePointer<CChar>(data.bytes)) : nil)`
	`507`	`+ let errorString = (data.length > 0 ? NSString(data: data, encoding: NSUTF8StringEncoding) as? String : nil)`
`508`	`508`	`return SignalProducer(error: .ShellTaskFailed(exitCode: terminationStatus, standardError: errorString))`
`509`	`509`	`}`
`510`	`510`	`.start(observer)`