Merge pull request #21 from CodaFi/beta-five

CodaFi · CodaFi · commit a7a20a53545c · 2015-08-08T01:40:46.000-06:00
Beta Five Updates
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 *.xcscmblueprint
+Cartfile.resolved
 Carthage/
 
 # CocoaPods
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck
@@ -1 +1 @@
-Subproject commit 4f74ca9d81faf822e10d81c9b22aa27478c64986
+Subproject commit 39dbec2ccd9334baade439d6eb93c7ea2e437537
diff --git a/Concurrent.xcodeproj/project.pbxproj b/Concurrent.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		82BA2A041B75E8CA00F9F201 /* ConcurrentSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82BA2A031B75E8CA00F9F201 /* ConcurrentSpec.swift */; };
+		82BA2A051B75E8CA00F9F201 /* ConcurrentSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82BA2A031B75E8CA00F9F201 /* ConcurrentSpec.swift */; };
 		8410224B1B1A9F9E00E799A0 /* SwiftCheck.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84A53E011B1A9F1900E8A107 /* SwiftCheck.framework */; };
 		8410224F1B1A9FAC00E799A0 /* SwiftCheck.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84A53DFD1B1A9F1900E8A107 /* SwiftCheck.framework */; };
 		841022501B1A9FBE00E799A0 /* SwiftCheck.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84A53DFD1B1A9F1900E8A107 /* SwiftCheck.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -134,6 +136,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		82BA2A031B75E8CA00F9F201 /* ConcurrentSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConcurrentSpec.swift; sourceTree = "<group>"; };
 		841022531B1AA00D00E799A0 /* MVarSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MVarSpec.swift; sourceTree = "<group>"; };
 		84152B791A818C95006387D5 /* SVar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SVar.swift; sourceTree = "<group>"; };
 		8434F98019E9CD76008D9909 /* Concurrent.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Concurrent.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -246,6 +249,7 @@
 		8434F98F19E9CD76008D9909 /* ConcurrentTests */ = {
 			isa = PBXGroup;
 			children = (
+				82BA2A031B75E8CA00F9F201 /* ConcurrentSpec.swift */,
 				84F467811B1B9244002A4C4C /* ChanSpec.swift */,
 				841022531B1AA00D00E799A0 /* MVarSpec.swift */,
 				84EA2C5B1B240C4D0001FB3F /* SVarSpec.swift */,
@@ -514,6 +518,7 @@
 				8434F9D019E9CE1D008D9909 /* PiCalculus.swift in Sources */,
 				84EA2C5A1B23AE5F0001FB3F /* MVarSpec.swift in Sources */,
 				84EA2C591B23AE5D0001FB3F /* ChanSpec.swift in Sources */,
+				82BA2A041B75E8CA00F9F201 /* ConcurrentSpec.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -541,6 +546,7 @@
 				84F467831B1B9244002A4C4C /* ChanSpec.swift in Sources */,
 				841022551B1AA00D00E799A0 /* MVarSpec.swift in Sources */,
 				84A53D6F1B1A8FC400E8A107 /* PiCalculus.swift in Sources */,
+				82BA2A051B75E8CA00F9F201 /* ConcurrentSpec.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Concurrent/Chan.swift b/Concurrent/Chan.swift
@@ -50,7 +50,7 @@ public struct Chan<A> {
 	
 	/// Writes a list of values to a channel.
 	public func writeList(xs : [A]) {
-		xs.map({ self.write($0) })
+		xs.forEach(self.write)
 	}
 
 	/// Returns whether the channel is empty.
diff --git a/Concurrent/Future.swift b/Concurrent/Future.swift
@@ -54,7 +54,7 @@ public struct Future<A> {
 
 public func forkFutures<A>(ios : [() -> A]) -> Chan<Optional<A>> {
 	let c : Chan<Optional<A>> = Chan()
-	_ = ios.map({ forkFuture($0) }).map({ f in f.then({ c.write($0) }) })
+	ios.map(forkFuture).forEach { f in f.then(c.write) }
 	return c
 }
 
@@ -80,7 +80,7 @@ public func forkFuture<A>(io : () throws -> A) -> Future<A> {
 		p.threadID.modify_({ _ in .None })
 		let val = p.complete(paranoid)
 		let sTodo = p.finalizers.swap([])
-		let _ = sTodo.map(p.runFinalizerWithOptional(val))
+		sTodo.forEach { _ in p.runFinalizerWithOptional(val) }
 	}
 
 	_ = forkIO {
diff --git a/ConcurrentTests/ChanSpec.swift b/ConcurrentTests/ChanSpec.swift
@@ -9,7 +9,6 @@
 import Concurrent
 import XCTest
 import SwiftCheck
-import Swiftz
 
 private enum Action {
 	case NewChan
diff --git a/ConcurrentTests/ConcurrentSpec.swift b/ConcurrentTests/ConcurrentSpec.swift
@@ -0,0 +1,14 @@
+//
+//  ConcurrentSpec.swift
+//  Concurrent
+//
+//  Created by Robert Widmann on 8/8/15.
+//  Copyright © 2015 TypeLift. All rights reserved.
+//
+
+import XCTest
+
+public func error<A>(x : String) -> A {
+	XCTFail(x)
+	fatalError(x)
+}
diff --git a/ConcurrentTests/MVarSpec.swift b/ConcurrentTests/MVarSpec.swift
@@ -9,7 +9,6 @@
 import Concurrent
 import XCTest
 import SwiftCheck
-import Swiftz
 
 private enum Action {
 	case NewEmptyMVar
diff --git a/ConcurrentTests/SVarSpec.swift b/ConcurrentTests/SVarSpec.swift
@@ -9,7 +9,6 @@
 import Concurrent
 import XCTest
 import SwiftCheck
-import Swiftz
 
 private enum Action {
 	case NewEmptySVar

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public struct Chan<A> {`
`50`	`50`
`51`	`51`	`/// Writes a list of values to a channel.`
`52`	`52`	`public func writeList(xs : [A]) {`
`53`		`- xs.map({ self.write($0) })`
	`53`	`+ xs.forEach(self.write)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/// Returns whether the channel is empty.`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public struct Future<A> {`
`54`	`54`
`55`	`55`	`public func forkFutures<A>(ios : [() -> A]) -> Chan<Optional<A>> {`
`56`	`56`	`let c : Chan<Optional<A>> = Chan()`
`57`		`- _ = ios.map({ forkFuture($0) }).map({ f in f.then({ c.write($0) }) })`
	`57`	`+ ios.map(forkFuture).forEach { f in f.then(c.write) }`
`58`	`58`	`return c`
`59`	`59`	`}`
`60`	`60`
`@@ -80,7 +80,7 @@ public func forkFuture<A>(io : () throws -> A) -> Future<A> {`
`80`	`80`	`p.threadID.modify_({ _ in .None })`
`81`	`81`	`let val = p.complete(paranoid)`
`82`	`82`	`let sTodo = p.finalizers.swap([])`
`83`		`- let _ = sTodo.map(p.runFinalizerWithOptional(val))`
	`83`	`+ sTodo.forEach { _ in p.runFinalizerWithOptional(val) }`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`_ = forkIO {`