Merge remote-tracking branch 'origin/swift/2.0' into addAnyHandler

Author: inamiy

.gitignore

@@ -1,5 +1,41 @@
-# Xcode
+#--------------------------------------------------------------------------------
+# https://github.com/github/gitignore/blob/master/Global/OSX.gitignore
+#--------------------------------------------------------------------------------
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+#--------------------------------------------------------------------------------
+# https://github.com/github/gitignore/blob/master/Global/Xcode.gitignore
+# https://github.com/github/gitignore/blob/master/Objective-C.gitignore
+# https://github.com/github/gitignore/blob/master/Swift.gitignore
+#--------------------------------------------------------------------------------
+## Build generated
 build/
+DerivedData/
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -8,14 +44,32 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
-*.xccheckout
+xcuserdata/
+
+## Other
 *.moved-aside
-DerivedData
+*.xccheckout
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
 *.ipa
-*.xcuserstate
 
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+Packages/
+.build/
+
+# CocoaPods
+Pods/
+
+# Carthage
 Carthage/Build
-.build
-Packages/
+
+# fastlane
+fastlane/report.xml
+fastlane/screenshots
+fastlane/test_output

.swiftlint.yml

@@ -0,0 +1,34 @@
+#
+# NOTE:
+# To fix `trailing_whitespace` error,
+# go to Xcode Preferences -> Text Editing -> turn on both "Automatically trim trailing whitespace" and "Including whitespace-only lines".
+#
+
+disabled_rules:
+  - variable_name_min_length
+  - line_length
+  - function_body_length
+  - type_body_length
+  - file_length
+  - cyclomatic_complexity
+
+  - opening_brace         # prefer Allman-Style
+  - statement_position    # allow `if {}\nelse {}`
+  - type_name             # allow "_" prefix name
+  - variable_name         # allow "_" prefix name
+  - todo
+  - valid_docs
+
+opt_in_rules:
+  - empty_count
+
+#included:
+#  - Sources
+#  - Tests
+
+excluded:
+  - Carthage
+  - Packages
+  - Benchmark/Packages
+
+reporter: "xcode" # reporter type (xcode, json, csv, checkstyle)

Package.swift

@@ -10,4 +10,4 @@ import PackageDescription
 
 let package = Package(
     name: "SwiftState"
-)
+)

Sources/Disposable.swift

@@ -7,9 +7,9 @@
 //
 
 //
-// NOTE: 
+// NOTE:
 // This file is a partial copy from ReactiveCocoa v4.0.0-alpha.4 (removing `Atomic` dependency),
-// which has not been taken out as microframework yet.
+// which has not been taken out as microframework.
 // https://github.com/ReactiveCocoa/ReactiveCocoa/issues/2579
 //
 // Note that `ActionDisposable` also works as `() -> ()` wrapper to help suppressing warning:
@@ -19,27 +19,27 @@
 /// Represents something that can be “disposed,” usually associated with freeing
 /// resources or canceling work.
 public protocol Disposable {
-	/// Whether this disposable has been disposed already.
-	var disposed: Bool { get }
+    /// Whether this disposable has been disposed already.
+    var disposed: Bool { get }
 
-	func dispose()
+    func dispose()
 }
 
 /// A disposable that will run an action upon disposal.
 public final class ActionDisposable: Disposable {
-	private var action: (() -> ())?
+    private var action: (() -> ())?
 
-	public var disposed: Bool {
-		return action == nil
-	}
+    public var disposed: Bool {
+        return action == nil
+    }
 
-	/// Initializes the disposable to run the given action upon disposal.
-	public init(action: () -> ()) {
-		self.action = action
-	}
+    /// Initializes the disposable to run the given action upon disposal.
+    public init(action: () -> ()) {
+        self.action = action
+    }
 
-	public func dispose() {
-		self.action?()
+    public func dispose() {
+        self.action?()
         self.action = nil
-	}
-}
+    }
+}

Sources/EventType.swift

@@ -39,7 +39,7 @@ extension Event: RawRepresentable
             self = .Any
         }
     }
-    
+
     public var rawValue: E?
     {
         switch self {
@@ -63,12 +63,22 @@ public func == <E: EventType>(lhs: Event<E>, rhs: Event<E>) -> Bool
 
 public func == <E: EventType>(lhs: Event<E>, rhs: E) -> Bool
 {
-    return lhs.hashValue == rhs.hashValue
+    switch lhs {
+    case .Some(let x):
+        return x == rhs
+    case .Any:
+        return false
+    }
 }
 
 public func == <E: EventType>(lhs: E, rhs: Event<E>) -> Bool
 {
-    return lhs.hashValue == rhs.hashValue
+    switch rhs {
+    case .Some(let x):
+        return x == lhs
+    case .Any:
+        return false
+    }
 }
 
 // MARK: NoEvent