Update to Swift 3.1

Author: CodaFi

.travis.yml

@@ -5,9 +5,8 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode8
+      osx_image: xcode8.3
       before_install:
-        - gem install cocoapods
         - git submodule update --init --recursive
         - pushd Utilities
         - ./compile.sh
@@ -17,7 +16,7 @@ matrix:
         - carthage build --no-skip-current
     - os: osx
       language: objective-c
-      osx_image: xcode8
+      osx_image: xcode8.3
       before_install:
         - git submodule update --init --recursive
         - pushd Utilities
@@ -46,9 +45,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-3.0.2-release/ubuntu1404/swift-3.0.2-RELEASE/swift-3.0.2-RELEASE-ubuntu14.04.tar.gz
-        - tar xzf swift-3.0.2-RELEASE-ubuntu14.04.tar.gz
-        - export PATH=${PWD}/swift-3.0.2-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
+        - wget https://swift.org/builds/swift-3.1-release/ubuntu1404/swift-3.1-RELEASE/swift-3.1-RELEASE-ubuntu14.04.tar.gz
+        - tar xzf swift-3.1-RELEASE-ubuntu14.04.tar.gz
+        - export PATH=${PWD}/swift-3.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
         - pushd Utilities
         - ./compile.sh
         - popd

Sources/Arbitrary.swift

@@ -244,7 +244,7 @@ extension Float : Arbitrary {
 	public static func shrink(_ x : Float) -> [Float] {
 		let tail = Int64(x).shrinkIntegral.map(Float.init(_:))
 		if (x.sign == .minus) {
-			return [abs(x)] + tail
+			return [Swift.abs(x)] + tail
 		}
 		return tail
 	}
@@ -273,7 +273,7 @@ extension Double : Arbitrary {
 	public static func shrink(_ x : Double) -> [Double] {
 		let tail = Int64(x).shrinkIntegral.map(Double.init(_:))
 		if (x.sign == .minus) {
-			return [abs(x)] + tail
+			return [Swift.abs(x)] + tail
 		}
 		return tail
 	}

Sources/Lattice.swift

@@ -57,24 +57,24 @@ extension Int64 : LatticeType {}
 extension Float : LatticeType {
 	/// The lower limit of the `Float` type.
 	public static var min : Float {
-		return FLT_MIN
+		return Float.leastNormalMagnitude
 	}
 
 	/// The upper limit of the `Float` type.
 	public static var max : Float {
-		return FLT_MAX
+		return Float.greatestFiniteMagnitude
 	}
 }
 
 extension Double : LatticeType {
 	/// The lower limit of the `Double` type.
 	public static var min : Double {
-		return DBL_MIN
+		return Double.leastNormalMagnitude
 	}
 
 	/// The upper limit of the `Double` type.
 	public static var max : Double {
-		return DBL_MAX
+		return Double.greatestFiniteMagnitude
 	}
 }
 

Sources/Modifiers.swift

@@ -313,8 +313,8 @@ public struct PointerOf<T : Arbitrary> : Arbitrary, CustomStringConvertible {
 	fileprivate let _impl : PointerOfImpl<T>
 
 	/// Retrieves the underlying pointer value.
-	public var getPointer : UnsafePointer<T> {
-		return UnsafePointer(self._impl.ptr!)
+	public var getPointer : UnsafeBufferPointer<T> {
+		return UnsafeBufferPointer(start: self._impl.ptr, count: self.size)
 	}
 
 	public var size : Int {
@@ -673,7 +673,7 @@ private final class PointerOfImpl<T : Arbitrary> : Arbitrary {
 				return Gen.pure(PointerOfImpl(UnsafeMutablePointer<T>.allocate(capacity: size), size))
 			}
 			let pt = UnsafeMutablePointer<T>.allocate(capacity: n)
-			let gt = sequence(Array((0..<n)).map { _ in T.arbitrary }).map(pt.initialize)
+			let gt = sequence(Array((0..<n)).map { _ in T.arbitrary }).map({ UnsafeMutableBufferPointer(start: pt, count: n).initialize(from: $0) })
 			return gt.map { _ in PointerOfImpl(pt, n) }
 		}
 	}

Tests/SwiftCheckTests/FileCheck.swift

@@ -9,8 +9,6 @@
 import Foundation
 #if os(Linux)
   import Glibc
-
-  typealias NSRegularExpression = RegularExpression
 #else
   import Darwin
 #endif

Tests/SwiftCheckTests/ModifierSpec.swift

@@ -27,7 +27,7 @@ class ModifierSpec : XCTestCase {
 			// CHECK-NEXT: *** Passed 100 tests
 			// CHECK-NEXT: .
 			property("Pointers behave") <- forAll { (x : PointerOf<Int>) in
-				return x.size != 0
+				return x.size != 0 && x.getPointer.count == x.size
 			}
 
 			// CHECK-NEXT: *** Passed 100 tests