Merge branch 'key'

hmlongco · Mar 17, 2024 · 018650b · 018650b
2 parents bb6793a + 07f6d13
commit 018650b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/Sources/Factory/Factory/Key.swift b/Sources/Factory/Factory/Key.swift
@@ -7,21 +7,17 @@
 
 import Foundation
 
-public struct FactoryKey: Hashable {
+internal struct FactoryKey: Hashable {
 
-    @usableFromInline let type: ObjectIdentifier
-    @usableFromInline let key: StaticString
+    let type: ObjectIdentifier
+    let key: StaticString
 
-    @inlinable
-    @inline(__always)
-    init(type: Any.Type, key: StaticString = #function) {
+    internal init(type: Any.Type, key: StaticString) {
         self.type = ObjectIdentifier(type)
         self.key = key
     }
 
-    @inlinable
-    @inline(__always)
-    public func hash(into hasher: inout Hasher) {
+    internal func hash(into hasher: inout Hasher) {
         hasher.combine(self.type)
         if key.hasPointerRepresentation {
             hasher.combine(bytes: UnsafeRawBufferPointer(start: key.utf8Start, count: key.utf8CodeUnitCount))
@@ -30,8 +26,7 @@ public struct FactoryKey: Hashable {
         }
     }
 
-    @inlinable
-    public static func == (lhs: Self, rhs: Self) -> Bool {
+    internal static func == (lhs: Self, rhs: Self) -> Bool {
         guard lhs.type == rhs.type && lhs.key.hasPointerRepresentation == rhs.key.hasPointerRepresentation else {
             return false
         }

diff --git a/Sources/Factory/Factory/Registrations.swift b/Sources/Factory/Factory/Registrations.swift
@@ -30,7 +30,7 @@ import Foundation
 public struct FactoryRegistration<P,T> {
 
     /// Key used to manage registrations and cached values.
-    public let key: FactoryKey
+    internal let key: FactoryKey
     /// A strong reference to the container supporting this Factory.
     internal let container: ManagedContainer
     /// Typed factory with scope and factory.