Merge pull request Carthage#572 from Carthage/collect-operator

Put collect() operator in its place
vmaraccini · Jun 18, 2015 · 69b8101 · 69b8101
2 parents 41e9384 + e8e2fae
commit 69b8101
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/Source/CarthageKit/Project.swift b/Source/CarthageKit/Project.swift
@@ -276,7 +276,7 @@ public final class Project {
 
 		return loadCombinedCartfile()
 			|> flatMap(.Merge) { cartfile in resolver.resolveDependenciesInCartfile(cartfile) }
-			|> reduce([]) { $0 + [ $1 ] }
+			|> collect
 			|> map { ResolvedCartfile(dependencies: $0) }
 	}
 

diff --git a/Source/CarthageKit/Resolver.swift b/Source/CarthageKit/Resolver.swift
@@ -80,7 +80,7 @@ public struct Resolver {
 						}
 
 						return self.versionsForDependency(dependency.project)
-							|> reduce([]) { $0 + [ $1 ] }
+							|> collect
 							|> flatMap(.Merge) { nodes -> SignalProducer<PinnedVersion, CarthageError> in
 								if nodes.isEmpty {
 									return SignalProducer(error: CarthageError.TaggedVersionNotFound(dependency.project))
@@ -95,7 +95,7 @@ public struct Resolver {
 					|> startOn(scheduler)
 					|> observeOn(scheduler)
 					|> map { DependencyNode(project: dependency.project, proposedVersion: $0, versionSpecifier: dependency.version) }
-					|> reduce([]) { $0 + [ $1 ] }
+					|> collect
 					|> map(sorted)
 					|> flatMap(.Concat) { nodes -> SignalProducer<DependencyNode, CarthageError> in
 						if nodes.isEmpty {

diff --git a/Source/CarthageKit/Xcode.swift b/Source/CarthageKit/Xcode.swift
@@ -645,7 +645,7 @@ private func mergeExecutables(executableURLs: [NSURL], outputURL: NSURL) -> Sign
 				return .failure(.ParseError(description: "expected file URL to built executable, got (URL)"))
 			}
 		}
-		|> reduce([]) { $0 + [ $1 ] }
+		|> collect
 		|> flatMap(.Merge) { executablePaths -> SignalProducer<TaskEvent<NSData>, CarthageError> in
 			let lipoTask = TaskDescription(launchPath: "/usr/bin/xcrun", arguments: [ "lipo", "-create" ] + executablePaths + [ "-output", outputURL.path! ])
 

diff --git a/Source/CarthageKitTests/ArchiveSpec.swift b/Source/CarthageKitTests/ArchiveSpec.swift
@@ -75,7 +75,7 @@ class ArchiveSpec: QuickSpec {
 				let enumerationResult = NSFileManager.defaultManager().carthage_enumeratorAtURL(unzipResult?.value ?? temporaryURL, includingPropertiesForKeys: [], options: nil)
 					|> map { enumerator, URL in URL }
 					|> map { $0.lastPathComponent! }
-					|> reduce([]) { $0 + [ $1 ] }
+					|> collect
 					|> single
 
 				expect(enumerationResult).notTo(beNil())

diff --git a/Source/CarthageKitTests/ResolverSpec.swift b/Source/CarthageKitTests/ResolverSpec.swift
@@ -22,10 +22,8 @@ class ResolverSpec: QuickSpec {
 
 	private func orderedDependencies(resolver: Resolver, fromCartfile cartfile: Cartfile) -> [[String: PinnedVersion]] {
 		let result = resolver.resolveDependenciesInCartfile(cartfile)
-			|> reduce([]) { (var dependencies, dependency) -> [[String: PinnedVersion]] in
-				dependencies.append([ dependency.project.name: dependency.version ])
-				return dependencies
-			}
+			|> map { [ $0.project.name: $0.version ] }
+			|> collect
 			|> first
 
 		expect(result).notTo(beNil())

diff --git a/Source/CarthageKitTests/XcodeSpec.swift b/Source/CarthageKitTests/XcodeSpec.swift
@@ -81,7 +81,7 @@ class XcodeSpec: QuickSpec {
 			// Verify that the iOS framework is a universal binary for device
 			// and simulator.
 			let architectures = architecturesInFramework(frameworkFolderURL)
-				|> reduce([]) { $0 + [ $1 ] }
+				|> collect
 				|> single
 
 			expect(architectures?.value).to(contain("i386"))
@@ -108,7 +108,7 @@ class XcodeSpec: QuickSpec {
 			expect(strippingResult.value).notTo(beNil())
 
 			let strippedArchitectures = architecturesInFramework(targetURL)
-				|> reduce([]) { $0 + [ $1 ] }
+				|> collect
 				|> single
 
 			expect(strippedArchitectures?.value).notTo(contain("i386"))

diff --git a/Source/carthage/Archive.swift b/Source/carthage/Archive.swift
@@ -27,7 +27,7 @@ public struct ArchiveCommand: CommandType {
 					|> on(next: { path in
 						carthage.println(formatting.bullets + "Found " + formatting.path(string: path))
 					})
-					|> reduce([]) { $0 + [ $1 ] }
+					|> collect
 					|> flatMap(.Merge) { paths -> SignalProducer<(), CarthageError> in
 						if paths.isEmpty {
 							return SignalProducer(error: CarthageError.InvalidArgument(description: "Could not find any copies of \(options.frameworkName).framework. Make sure you're in the project’s root and that the framework has already been built using 'carthage build --no-skip-current'."))