Update Result to 3.2

ikesyo · ikesyo · commit 708451a21d95 · 2017-03-02T06:50:34.000+09:00
diff --git a/.Package.test.swift b/.Package.test.swift
@@ -3,6 +3,7 @@ import PackageDescription
 let package = Package(
     name: "ReactiveTask",
     dependencies: [
+        .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 0)..<Version(3, .max, .max)),
         .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
         .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),
         .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 6),
diff --git a/Cartfile b/Cartfile
@@ -1 +1,2 @@
+github "antitypical/Result" ~> 3.2
 github "ReactiveCocoa/ReactiveSwift" ~> 1.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "Quick/Nimble" "v6.0.1"
 github "Quick/Quick" "v1.1.0"
 github "ReactiveCocoa/ReactiveSwift" "1.1.0"
-github "antitypical/Result" "3.1.0"
+github "antitypical/Result" "3.2.0"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 2dd1a0c7bca4cc44082f72020fe8b14491056f88
+Subproject commit 5db7bc7b4af78d9b78294e1de87c51ae4726e4a2
diff --git a/Package.swift b/Package.swift
@@ -3,6 +3,7 @@ import PackageDescription
 let package = Package(
     name: "ReactiveTask",
     dependencies: [
+        .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 0)..<Version(3, .max, .max)),
         .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
     ]
 )
diff --git a/Sources/Task.swift b/Sources/Task.swift
@@ -436,7 +436,7 @@ extension Task {
 				}
 			}
 
-			SignalProducer(result: Pipe.create(queue, group) &&& Pipe.create(queue, group))
+			SignalProducer(result: Pipe.create(queue, group).fanout(Pipe.create(queue, group)))
 				.flatMap(.merge) { stdoutPipe, stderrPipe -> SignalProducer<TaskEvent<Data>, TaskError> in
 					let stdoutProducer = stdoutPipe.transferReadsToProducer()
 					let stderrProducer = stderrPipe.transferReadsToProducer()

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+github "antitypical/Result" ~> 3.2`
`1`	`2`	`github "ReactiveCocoa/ReactiveSwift" ~> 1.1`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import PackageDescription`
`3`	`3`	`let package = Package(`
`4`	`4`	`name: "ReactiveTask",`
`5`	`5`	`dependencies: [`
	`6`	`+ .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 0)..<Version(3, .max, .max)),`
`6`	`7`	`.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),`
`7`	`8`	`]`
`8`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ extension Task {`
`436`	`436`	`}`
`437`	`437`	`}`
`438`	`438`
`439`		`- SignalProducer(result: Pipe.create(queue, group) &&& Pipe.create(queue, group))`
	`439`	`+ SignalProducer(result: Pipe.create(queue, group).fanout(Pipe.create(queue, group)))`
`440`	`440`	`.flatMap(.merge) { stdoutPipe, stderrPipe -> SignalProducer<TaskEvent<Data>, TaskError> in`
`441`	`441`	`let stdoutProducer = stdoutPipe.transferReadsToProducer()`
`442`	`442`	`let stderrProducer = stderrPipe.transferReadsToProducer()`