From 64c7b16764a95342ef6128319a6859470a299f44 Mon Sep 17 00:00:00 2001
From: Christian Treffs <ctreffs@gmail.com>
Date: Mon, 3 Aug 2020 11:14:35 +0200
Subject: [PATCH] Use unsafelyUnwrapped more often

---
 Sources/FirebladeECS/Family+Coding.swift  | 2 +-
 Sources/FirebladeECS/Nexus+Internal.swift | 4 ++--
 Sources/FirebladeECS/Nexus.swift          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/FirebladeECS/Family+Coding.swift b/Sources/FirebladeECS/Family+Coding.swift
index 6dadf68..bbcd395 100644
--- a/Sources/FirebladeECS/Family+Coding.swift
+++ b/Sources/FirebladeECS/Family+Coding.swift
@@ -10,7 +10,7 @@ private struct FamilyMemberContainer<R> where R: FamilyRequirementsManaging {
 }
 
 extension CodingUserInfoKey {
-    fileprivate static let nexusCodingStrategy = CodingUserInfoKey(rawValue: "nexusCodingStrategy")!
+    fileprivate static let nexusCodingStrategy = CodingUserInfoKey(rawValue: "nexusCodingStrategy").unsafelyUnwrapped
 }
 
 // MARK: - encoding
diff --git a/Sources/FirebladeECS/Nexus+Internal.swift b/Sources/FirebladeECS/Nexus+Internal.swift
index 0f05c4a..d0e570d 100644
--- a/Sources/FirebladeECS/Nexus+Internal.swift
+++ b/Sources/FirebladeECS/Nexus+Internal.swift
@@ -127,10 +127,10 @@ extension Nexus {
     }
 
     func add(entityWithId entityId: EntityIdentifier, toFamilyWithTraits traits: FamilyTraitSet) {
-        familyMembersByTraits[traits]!.insert(entityId, at: entityId.id)
+        familyMembersByTraits[traits].unsafelyUnwrapped.insert(entityId, at: entityId.id)
     }
 
     func remove(entityWithId entityId: EntityIdentifier, fromFamilyWithTraits traits: FamilyTraitSet) {
-        familyMembersByTraits[traits]!.remove(at: entityId.id)
+        familyMembersByTraits[traits].unsafelyUnwrapped.remove(at: entityId.id)
     }
 }
diff --git a/Sources/FirebladeECS/Nexus.swift b/Sources/FirebladeECS/Nexus.swift
index 306c0ec..d40da02 100644
--- a/Sources/FirebladeECS/Nexus.swift
+++ b/Sources/FirebladeECS/Nexus.swift
@@ -87,6 +87,6 @@ public struct DefaultCodingStrategy: CodingStrategy {
     public init() { }
 
     public func codingKey<C>(for componentType: C.Type) -> DynamicCodingKey where C: Component {
-        DynamicCodingKey(stringValue: "\(C.self)")!
+        DynamicCodingKey(stringValue: "\(C.self)").unsafelyUnwrapped
     }
 }