From 92f0c5a8192b18bdc9a5e410240bfc7f740f8c70 Mon Sep 17 00:00:00 2001 From: Matthew Purland Date: Fri, 1 Jan 2016 15:26:46 -0800 Subject: [PATCH 1/3] Cleanup. --- Tyro/EitherExt.swift | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/Tyro/EitherExt.swift b/Tyro/EitherExt.swift index 17783c9..713c507 100644 --- a/Tyro/EitherExt.swift +++ b/Tyro/EitherExt.swift @@ -90,33 +90,3 @@ extension Dictionary where Value : EitherType { } } } - -//struct EitherBuilder { -// let value : R? -// -// init(value v : R?) { -// value = v -// } -// -// static func either(r : R?) -> EitherBuilder { -// return EitherBuilder(value : r) -// } -// -// func orThat(l : L) -> Either { -// return value.maybe(Either.Left(l), onSome : { (r) -> Either in -// return .Right(r) -// }) -// } -//} -// -//func eitherThis(_ r : R?) -> EitherBuilder { -// return EitherBuilder.either(r) -//} - -//func left(_ left : L) -> Either { -// return .Left(left) -//} -// -//func right(_ right : R) -> Either { -// return .Right(right) -//} From fc99d0a7766aafdde33b64b1f2e643f144d337e6 Mon Sep 17 00:00:00 2001 From: Matthew Purland Date: Sat, 2 Jan 2016 15:29:04 -0800 Subject: [PATCH 2/3] Updated Either to use left right from Swiftz --- Tyro/EitherExt.swift | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Tyro/EitherExt.swift b/Tyro/EitherExt.swift index 713c507..bce2bb4 100644 --- a/Tyro/EitherExt.swift +++ b/Tyro/EitherExt.swift @@ -25,23 +25,6 @@ public protocol EitherType { } extension Either : EitherType { - public var right : R? { - switch self { - case .Right(let r): return r - default: return nil - } - } - - public var left : L? { - switch self { - case .Left(let l): return l - default: return nil - } - } - - func fmap(f : RA -> RB, e : Either) -> Either { - return f <^> e - } } extension Array where Element : EitherType { From 3a143b7a97b0427c1beb0f1985a341f428d83ae5 Mon Sep 17 00:00:00 2001 From: Matthew Purland Date: Sun, 3 Jan 2016 15:29:36 -0800 Subject: [PATCH 3/3] Updated Carthage checkouts for Swiftz and SwiftCheck --- Carthage/Checkouts/SwiftCheck | 2 +- Carthage/Checkouts/Swiftz | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck index b89b246..118d474 160000 --- a/Carthage/Checkouts/SwiftCheck +++ b/Carthage/Checkouts/SwiftCheck @@ -1 +1 @@ -Subproject commit b89b24620673de8c28ee2492429ee822dded8136 +Subproject commit 118d47429bef32296e2f663ae72d8aa24d4c9a66 diff --git a/Carthage/Checkouts/Swiftz b/Carthage/Checkouts/Swiftz index 38f6473..2dfc7a0 160000 --- a/Carthage/Checkouts/Swiftz +++ b/Carthage/Checkouts/Swiftz @@ -1 +1 @@ -Subproject commit 38f6473236fd0f42036bbad5d1b1ce432ae93b0a +Subproject commit 2dfc7a07d6862e50bcbce8b5e7db555094cc8b46