Merge pull request #55 from CodaFi/touch-up

CodaFi · web-flow · commit 6095c2ce07b8 · 2019-03-29T19:50:55.000-04:00
Update to Swift 5
diff --git a/.travis.yml b/.travis.yml
@@ -5,16 +5,14 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode9.3
+      osx_image: xcode10.2
       before_install:
         - git submodule update --init --recursive
       script:
-      # Restore pod build before shipping for 3.0 
-      # - pod lib lint
         - carthage build --no-skip-current
     - os: osx
       language: objective-c
-      osx_image: xcode9.3
+      osx_image: xcode10.2
       before_install:
         - git submodule update --init --recursive
       script:
@@ -31,9 +29,9 @@ matrix:
       before_install:
         - git submodule update --init --recursive
         - wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
-        - wget https://swift.org/builds/swift-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz
-        - tar xzf swift-4.1-RELEASE-ubuntu14.04.tar.gz
-        - export PATH=${PWD}/swift-4.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
+        - wget https://swift.org/builds/swift-5.0-release/ubuntu1404/swift-5.0-RELEASE/swift-5.0-RELEASE-ubuntu14.04.tar.gz
+        - tar xzf swift-5.0-RELEASE-ubuntu14.04.tar.gz
+        - export PATH=${PWD}/swift-5.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
       script:
         - swift test
 notifications:
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "typelift/SwiftCheck" "0.10.0"
+github "typelift/SwiftCheck" "0.12.0"
diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck
@@ -1 +1 @@
-Subproject commit 43ffe7ab48366c36a697c54bcdd257876edd6fc6
+Subproject commit 077c096c3ddfc38db223ac8e525ad16ffb987138
diff --git a/Concurrent.xcodeproj/project.pbxproj b/Concurrent.xcodeproj/project.pbxproj
diff --git a/Concurrent.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Concurrent.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Concurrent.xcodeproj/xcshareddata/xcschemes/Concurrent-iOS.xcscheme b/Concurrent.xcodeproj/xcshareddata/xcschemes/Concurrent-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Concurrent.xcodeproj/xcshareddata/xcschemes/Concurrent-tvOS.xcscheme b/Concurrent.xcodeproj/xcshareddata/xcschemes/Concurrent-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Concurrent.xcodeproj/xcshareddata/xcschemes/Concurrent-watchOS.xcscheme b/Concurrent.xcodeproj/xcshareddata/xcschemes/Concurrent-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Concurrent.xcodeproj/xcshareddata/xcschemes/Concurrent.xcscheme b/Concurrent.xcodeproj/xcshareddata/xcschemes/Concurrent.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 
 import PackageDescription
 
diff --git a/Sources/Concurrent/IChan.swift b/Sources/Concurrent/IChan.swift
@@ -28,15 +28,18 @@ public struct IChan<A> {
 		self.init(v)
 	}
 
-	/// Reads all the values from a channel into a list.
+	/// Reads all the values from a channel into a lazy sequence.
 	///
-	/// This computation may block on empty IVars.
-	public func read() -> [A] {
-		let (a, ic) = self.ivar.read()
-		return [a] + ic.read()
+	/// Though the returned sequence is lazy, this computation may block
+	/// on reads of empty IVars.
+	public func read() -> LazySequence<UnfoldSequence<A, IChan<A>>> {
+		return sequence(state: self, next: { (ichan) -> A in
+			let (a, ic) = ichan.ivar.read()
+			defer { ichan = ic }
+			return a
+		}).lazy
 	}
 
-
 	/// Writes a single value to the head of the channel and returns a new write
 	/// head.
 	///
diff --git a/Sources/Concurrent/IVar.swift b/Sources/Concurrent/IVar.swift
@@ -29,7 +29,7 @@ public struct IVar<A> {
 	/// Creates a new `IVar` containing the supplied value.
 	public init(initial :  @autoclosure @escaping () -> A) {
 		let lock = MVar<()>()
-		self.init(lock, MVar(initial: initial()), initial)
+		self.init(lock, MVar(initial: initial()), initial())
 	}
 
 	/// Returns the contents of the `IVar`.
diff --git a/Sources/Concurrent/TVar.swift b/Sources/Concurrent/TVar.swift
@@ -32,8 +32,8 @@ public final class TVar<T> : Comparable, Hashable {
 	}
 
 	/// The hash value uniquely identifying this `TVar`.
-	public var hashValue : Int {
-		return _id
+	public func hash(into hasher: inout Hasher) {
+		self._id.hash(into: &hasher)
 	}
 
 	internal var value : TVarType<T>
@@ -86,7 +86,9 @@ internal final class TVarType<T> : Hashable {
 	var _fingerprint : Int
 	var _val : Any
 
-	var hashValue : Int { return _fingerprint }
+	func hash(into hasher: inout Hasher) {
+		self._fingerprint.hash(into: &hasher)
+	}
 
 	init(_ v : T, _ fingerprint : Int) {
 		self._fingerprint = fingerprint

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "typelift/SwiftCheck" "0.10.0"`
	`1`	`+github "typelift/SwiftCheck" "0.12.0"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:4.0`
	`1`	`+// swift-tools-version:5.0`
`2`	`2`
`3`	`3`	`import PackageDescription`
`4`	`4`