Optional.none を nil表記に変更

diff --git a/KCD/BattleInformationViewController.swift b/KCD/BattleInformationViewController.swift
index f0b7175..8a3bd24 100644 (file)
--- a/KCD/BattleInformationViewController.swift
+++ b/KCD/BattleInformationViewController.swift
@@ -53,7 +53,7 @@ class BattleInformationViewController: NSViewController {
             
         case let area?: mapArea = "\(area)"
             
             
         case let area?: mapArea = "\(area)"
             

-        case .none: return nil
+        case nil: return nil

             
         }
         
             
         }
         

diff --git a/KCD/DefaultKey.swift b/KCD/DefaultKey.swift
index 8569031..a0423fa 100644 (file)
--- a/KCD/DefaultKey.swift
+++ b/KCD/DefaultKey.swift
@@ -92,7 +92,7 @@ final class DefaultKey<T>: DefaultKeys {
         
         switch rawAlternativeValue {
             
         
         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
             
             
         case let .some(value): return value
             

diff --git a/KCD/DockInformationFutures.swift b/KCD/DockInformationFutures.swift
index 5d2e74d..1b0cfef 100644 (file)
--- a/KCD/DockInformationFutures.swift
+++ b/KCD/DockInformationFutures.swift
@@ -47,7 +47,7 @@ func createDockInformationFuture<T: DockInformationFutureCreatable>(number: Int)
         
         guard T.alreadyHasData(for: number) else {
             
         
         guard T.alreadyHasData(for: number) else {
             

-            return .none
+            return nil

         }
         
         guard let status = T.init(number: number) else {
         }
         
         guard let status = T.init(number: number) else {

diff --git a/KCD/Fleet.swift b/KCD/Fleet.swift
index bf74b75..c90e993 100644 (file)
--- 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 {
                     
                 
                 guard let deck = self.store.sync(execute: { self.store.deck(by: number) }) else {
                     

-                    return .none
+                    return nil

                 }
                 
                 return deck
                 }
                 
                 return deck

diff --git a/KCD/Future.swift b/KCD/Future.swift
index ddec9da..e1970e0 100644 (file)
--- a/KCD/Future.swift
+++ b/KCD/Future.swift
@@ -240,7 +240,7 @@ extension Future {
                     
                 case .error(let e)?: return Future<U>(e)
                     
                     
                 case .error(let e)?: return Future<U>(e)
                     

-                case .none: fatalError("Future not complete")
+                case nil: fatalError("Future not complete")

                     
                 }
             }
                     
                 }
             }