From 28f06dfb0095126c7ba67fcc99e8fdcf9b186709 Mon Sep 17 00:00:00 2001 From: Sam Carr Date: Wed, 27 May 2015 23:00:04 +0100 Subject: [PATCH 1/2] Fix typo in UI string literal: "poping" -> "popping" --- RxExample/RxExample/iOS/Main.storyboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RxExample/RxExample/iOS/Main.storyboard b/RxExample/RxExample/iOS/Main.storyboard index 43ba85ea..a29f0419 100644 --- a/RxExample/RxExample/iOS/Main.storyboard +++ b/RxExample/RxExample/iOS/Main.storyboard @@ -134,7 +134,7 @@ - + From be2a51cb9c038e7ec8d0f41eeb653fd1acfac059 Mon Sep 17 00:00:00 2001 From: Sam Carr Date: Thu, 28 May 2015 08:45:58 +0100 Subject: [PATCH 2/2] Fix typos in comments. --- RxSwift/RxSwift/Event.swift | 2 +- RxSwift/RxSwift/Observables/Observable+Concurrency.swift | 2 +- RxSwift/RxSwift/RxResult.swift | 2 +- RxSwift/RxSwift/Scheduler.swift | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RxSwift/RxSwift/Event.swift b/RxSwift/RxSwift/Event.swift index c60d087e..bb88ce45 100644 --- a/RxSwift/RxSwift/Event.swift +++ b/RxSwift/RxSwift/Event.swift @@ -19,7 +19,7 @@ import Foundation * >> error: unimplemented IR generation feature non-fixed multi-payload enum layout */ public enum Event : Printable { - // Box is used is because swift compiler doesn't know + // Box is used because swift compiler doesn't know // how to handle `Next(Element)` and it crashes. case Next(RxBox) // next element of a sequence case Error(ErrorType) // sequence failed with error diff --git a/RxSwift/RxSwift/Observables/Observable+Concurrency.swift b/RxSwift/RxSwift/Observables/Observable+Concurrency.swift index 26f57485..9d681eb9 100644 --- a/RxSwift/RxSwift/Observables/Observable+Concurrency.swift +++ b/RxSwift/RxSwift/Observables/Observable+Concurrency.swift @@ -14,7 +14,7 @@ import Foundation // or return result to main thread. // // `observeSingleOn` is optimized for that specific purpose. It assumes that sequence will have one element -// and in cases it has more then one element it will throw an exception. +// and in cases it has more than one element it will throw an exception. // // This is a huge performance win considering most general case. // diff --git a/RxSwift/RxSwift/RxResult.swift b/RxSwift/RxSwift/RxResult.swift index 7482f6e2..66126227 100644 --- a/RxSwift/RxSwift/RxResult.swift +++ b/RxSwift/RxSwift/RxResult.swift @@ -154,7 +154,7 @@ public let SuccessResult = success(()) // lift functions // "Lifts" functions that take normal arguments to functions that take `Result` monad arguments. -// Unfortunatelly these are not generic `Monad` lift functions because +// Unfortunately these are not generic `Monad` lift functions because // Creating generic lift functions that work for arbitrary monads is a lot more tricky. func lift(function: (T1) -> TRet) -> (RxResult) -> RxResult { diff --git a/RxSwift/RxSwift/Scheduler.swift b/RxSwift/RxSwift/Scheduler.swift index b80c9820..a148d71c 100644 --- a/RxSwift/RxSwift/Scheduler.swift +++ b/RxSwift/RxSwift/Scheduler.swift @@ -31,10 +31,10 @@ public protocol Scheduler: ImmediateScheduler { // // It's probably best to make sure all of the errors have been handled before // the computation finishes, but it's not unreasonable to change the implementation -// for release builds to silently fail (although I would not recommended). +// for release builds to silently fail (although I would not recommend it). // // Changing default behavior is not recommended because possible data corruption -// is "usually" a lot worse then letting program to crash. +// is "usually" a lot worse than letting the program crash. // func ensureScheduledSuccessfully(result: RxResult) -> RxResult { switch result {