From: masakih <masakih@users.sourceforge.jp>
Date: Mon, 13 Aug 2018 06:44:27 +0000 (+0900)
Subject: Optional.none を nil表記に変更
X-Git-Url: http://git.osdn.net/view?p=kcd%2FKCD.git;a=commitdiff_plain;h=ae580a64b8a5bc0eb1c8c375d52bcc204f230787;ds=sidebyside

Optional.none を nil表記に変更
---

diff --git a/KCD/BattleInformationViewController.swift b/KCD/BattleInformationViewController.swift
index f0b7175a..8a3bd248 100644
--- a/KCD/BattleInformationViewController.swift
+++ b/KCD/BattleInformationViewController.swift
@@ -53,7 +53,7 @@ class BattleInformationViewController: NSViewController {
             
         case let area?: mapArea = "\(area)"
             
-        case .none: return nil
+        case nil: return nil
             
         }
         
diff --git a/KCD/DefaultKey.swift b/KCD/DefaultKey.swift
index 85690315..a0423fa1 100644
--- a/KCD/DefaultKey.swift
+++ b/KCD/DefaultKey.swift
@@ -92,7 +92,7 @@ final class DefaultKey<T>: DefaultKeys {
         
         switch rawAlternativeValue {
             
-        case .none: fatalError("DefaultKey (\(self)) has no alternative value.")
+        case nil: fatalError("DefaultKey (\(self)) has no alternative value.")
             
         case let .some(value): return value
             
diff --git a/KCD/DockInformationFutures.swift b/KCD/DockInformationFutures.swift
index 5d2e74d1..1b0cfef0 100644
--- a/KCD/DockInformationFutures.swift
+++ b/KCD/DockInformationFutures.swift
@@ -47,7 +47,7 @@ func createDockInformationFuture<T: DockInformationFutureCreatable>(number: Int)
         
         guard T.alreadyHasData(for: number) else {
             
-            return .none
+            return nil
         }
         
         guard let status = T.init(number: number) else {
diff --git a/KCD/Fleet.swift b/KCD/Fleet.swift
index bf74b752..c90e993b 100644
--- a/KCD/Fleet.swift
+++ b/KCD/Fleet.swift
@@ -73,7 +73,7 @@ final class Fleet: NSObject {
                 
                 guard let deck = self.store.sync(execute: { self.store.deck(by: number) }) else {
                     
-                    return .none
+                    return nil
                 }
                 
                 return deck
diff --git a/KCD/Future.swift b/KCD/Future.swift
index ddec9da3..e1970e03 100644
--- a/KCD/Future.swift
+++ b/KCD/Future.swift
@@ -240,7 +240,7 @@ extension Future {
                     
                 case .error(let e)?: return Future<U>(e)
                     
-                case .none: fatalError("Future not complete")
+                case nil: fatalError("Future not complete")
                     
                 }
             }