Administrative fixes

typelift · Nov 3, 2017 · 5801206 · 5801206
1 parent d3e2b49
commit 5801206
Show file tree

Hide file tree

Showing 49 changed files with 747 additions and 694 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "Carthage/Checkouts/Swiftx"]
-	path = Carthage/Checkouts/Swiftx
 	url = https://github.com/typelift/Swiftx.git
-[submodule "Carthage/Checkouts/SwiftCheck"]
-	path = Carthage/Checkouts/SwiftCheck
-	url = https://github.com/typelift/SwiftCheck.git
-[submodule "Carthage/Checkouts/Operadics"]
-	path = Carthage/Checkouts/Operadics
-	url = https://github.com/typelift/Operadics.git
+	path = Carthage/Checkouts/Swiftx
 [submodule "Carthage/Checkouts/FileCheck"]
 	path = Carthage/Checkouts/FileCheck
 	url = https://github.com/trill-lang/FileCheck.git
+[submodule "Carthage/Checkouts/Operadics"]
+	path = Carthage/Checkouts/Operadics
+	url = https://github.com/typelift/Operadics.git
+[submodule "Carthage/Checkouts/SwiftCheck"]
+	path = Carthage/Checkouts/SwiftCheck
+	url = https://github.com/typelift/SwiftCheck.git
diff --git a/Sources/Swiftz/ArrayExt.swift b/Sources/Swiftz/ArrayExt.swift
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Maxwell Swadling. All rights reserved.
 //
 
-#if !XCODE_BUILD
+#if SWIFT_PACKAGE
 	import Operadics
 	import Swiftx
 #endif
@@ -128,7 +128,7 @@ extension Array /*: MonadZip*/ {
 	}
 
 	public func mzipWith<B, C>(_ other : [B], _ f : @escaping (A) -> (B) -> C) -> [C] {
-        return self.mzip(other).map { let (a, b) = $0; return uncurry(f)(a, b) }
+		return self.mzip(other).map { let (a, b) = $0; return uncurry(f)(a, b) }
 	}
 
 	public static func munzip<B>(ftab : [(A, B)]) -> ([A], [B]) {
@@ -221,7 +221,7 @@ extension Array {
 
 	/// Maps a function over an array that takes pairs of (index, element) to a different element.
 	public func mapWithIndex<U>(_ f : (Int, Element) -> U) -> [U] {
-        return zip((self.startIndex ..< self.endIndex), self).map { let (i, e) = $0; return f(i, e) }
+		return zip((self.startIndex ..< self.endIndex), self).map { let (i, e) = $0; return f(i, e) }
 	}
 
 	public func mapMaybe<U>(_ f : (Element) -> Optional<U>) -> [U] {

diff --git a/Sources/Swiftz/Arrow.swift b/Sources/Swiftz/Arrow.swift
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015-2016 TypeLift. All rights reserved.
 //
 
-#if !XCODE_BUILD
+#if SWIFT_PACKAGE
 	import Operadics
 	import Swiftx
 #endif

diff --git a/Sources/Swiftz/ArrowExt.swift b/Sources/Swiftz/ArrowExt.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 TypeLift. All rights reserved.
 //
 
-#if !XCODE_BUILD
+#if SWIFT_PACKAGE
 	import Operadics
 	import Swiftx
 #endif

diff --git a/Sources/Swiftz/Bifunctor.swift b/Sources/Swiftz/Bifunctor.swift
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014-2016 Maxwell Swadling. All rights reserved.
 //
 
-#if !XCODE_BUILD
+#if SWIFT_PACKAGE
 	import Swiftx
 #endif
 
@@ -66,7 +66,7 @@ public struct TupleBF<L, R> /*: Bifunctor*/ {
 		return self.bimap(f, identity)
 	}
 
-	public func rightMap(g : @escaping (R) -> D) -> (L, D) {
+	public func rightMap(_ g : @escaping (R) -> D) -> (L, D) {
 		return self.bimap(identity, g)
 	}
 }
diff --git a/Sources/Swiftz/Category.swift b/Sources/Swiftz/Category.swift
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015-2016 TypeLift. All rights reserved.
 //
 
-#if !XCODE_BUILD
+#if SWIFT_PACKAGE
 	import Operadics
 #endif
 

diff --git a/Sources/Swiftz/Const.swift b/Sources/Swiftz/Const.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015-2016 TypeLift. All rights reserved.
 //
 
-#if !XCODE_BUILD
+#if SWIFT_PACKAGE
 	import Swiftx
 #endif