wip

pointfreeco · Jun 15, 2024 · 4512e89 · 4512e89
1 parent 9352b0e
commit 4512e89
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 62 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -9,24 +9,6 @@
         "version" : "1.0.0"
       }
     },
-    {
-      "identity" : "swift-argument-parser",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser",
-      "state" : {
-        "revision" : "46989693916f56d1186bd59ac15124caef896560",
-        "version" : "1.3.1"
-      }
-    },
-    {
-      "identity" : "swift-benchmark",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/swift-benchmark",
-      "state" : {
-        "revision" : "8163295f6fe82356b0bcf8e1ab991645de17d096",
-        "version" : "0.1.2"
-      }
-    },
     {
       "identity" : "swift-clocks",
       "kind" : "remoteSourceControl",

diff --git a/Sources/Dependencies/Dependency.swift b/Sources/Dependencies/Dependency.swift
@@ -124,12 +124,12 @@ public struct Dependency<Value>: @unchecked Sendable, _HasInitialValues {
   /// ```
   ///
   /// - Parameter key: A dependency key to a specific resulting value.
-  public init<Key: TestDependencyKey>(
+  public init<Key: TestDependencyKey<Value>>(
     _ key: Key.Type,
     file: StaticString = #file,
     fileID: StaticString = #fileID,
     line: UInt = #line
-  ) where Key.Value == Value {
+  ) {
     self.init(
       \DependencyValues.[HashableType<Key>(file: file, line: line)],
       file: file,

diff --git a/Sources/Dependencies/DependencyValues.swift b/Sources/Dependencies/DependencyValues.swift
@@ -120,7 +120,7 @@ public struct DependencyValues: Sendable {
   @TaskLocal static var currentDependency = CurrentDependency()
 
   fileprivate var cachedValues = CachedValues()
-  private var storage: [ObjectIdentifier: AnySendable] = [:]
+  private var storage: [ObjectIdentifier: any Sendable] = [:]
 
   /// Creates a dependency values instance.
   ///
@@ -214,13 +214,12 @@ public struct DependencyValues: Sendable {
     file file: StaticString = #file,
     function function: StaticString = #function,
     line line: UInt = #line
-  ) -> Key.Value where Key.Value: Sendable {
+  ) -> Key.Value {
     get {
-      guard let base = self.storage[ObjectIdentifier(key)]?.base,
-        let dependency = base as? Key.Value
+      guard let base = self.storage[ObjectIdentifier(key)], let dependency = base as? Key.Value
       else {
         let context =
-          self.storage[ObjectIdentifier(DependencyContextKey.self)]?.base as? DependencyContext
+          self.storage[ObjectIdentifier(DependencyContextKey.self)] as? DependencyContext
           ?? defaultContext
 
         switch context {
@@ -249,7 +248,7 @@ public struct DependencyValues: Sendable {
       return dependency
     }
     set {
-      self.storage[ObjectIdentifier(key)] = AnySendable(newValue)
+      self.storage[ObjectIdentifier(key)] = newValue
     }
   }
 
@@ -295,14 +294,6 @@ public struct DependencyValues: Sendable {
   }
 }
 
-private struct AnySendable: @unchecked Sendable {
-  let base: Any
-  @inlinable
-  init<Base: Sendable>(_ base: Base) {
-    self.base = base
-  }
-}
-
 struct CurrentDependency {
   var name: StaticString?
   var file: StaticString?
@@ -352,21 +343,21 @@ private final class CachedValues: @unchecked Sendable {
   }
 
   private let lock = NSRecursiveLock()
-  fileprivate var cached = [CacheKey: AnySendable]()
+  fileprivate var cached = [CacheKey: any Sendable]()
 
   func value<Key: TestDependencyKey>(
     for key: Key.Type,
     context: DependencyContext,
     file: StaticString = #file,
     function: StaticString = #function,
     line: UInt = #line
-  ) -> Key.Value where Key.Value: Sendable {
+  ) -> Key.Value {
     XCTFailContext.$current.withValue(XCTFailContext(file: file, line: line)) {
       self.lock.lock()
       defer { self.lock.unlock() }
 
       let cacheKey = CacheKey(id: ObjectIdentifier(key), context: context)
-      guard let base = self.cached[cacheKey]?.base, let value = base as? Key.Value
+      guard let base = self.cached[cacheKey], let value = base as? Key.Value
       else {
         let value: Key.Value?
         switch context {
@@ -378,7 +369,7 @@ private final class CachedValues: @unchecked Sendable {
           value = Key.testValue
         }
 
-        guard let value = value
+        guard let value
         else {
           #if DEBUG
             if !DependencyValues.isSetting {
@@ -436,12 +427,12 @@ private final class CachedValues: @unchecked Sendable {
           #endif
           let value = Key.testValue
           if !DependencyValues.isSetting {
-            self.cached[cacheKey] = AnySendable(value)
+            self.cached[cacheKey] = value
           }
           return value
         }
 
-        self.cached[cacheKey] = AnySendable(value)
+        self.cached[cacheKey] = value
         return value
       }
 

diff --git a/Sources/Dependencies/DependencyValues/WithRandomNumberGenerator.swift b/Sources/Dependencies/DependencyValues/WithRandomNumberGenerator.swift
@@ -65,28 +65,13 @@ extension DependencyValues {
 ///
 /// See ``DependencyValues/withRandomNumberGenerator`` for more information.
 public final class WithRandomNumberGenerator: @unchecked Sendable {
-  private var generator: _AnyRandomNumberGenerator
-  private let lock = NSLock()
+  private var generator: any RandomNumberGenerator & Sendable
 
-  public init<T: RandomNumberGenerator & Sendable>(_ generator: T) {
-    self.generator = _AnyRandomNumberGenerator(generator)
+  public init(_ generator: some RandomNumberGenerator & Sendable) {
+    self.generator = generator
   }
 
-  public func callAsFunction<R>(_ work: (inout _AnyRandomNumberGenerator) -> R) -> R {
-    self.lock.lock()
-    defer { self.lock.unlock() }
+  public func callAsFunction<R>(_ work: (inout any RandomNumberGenerator & Sendable) -> R) -> R {
     return work(&self.generator)
   }
-
-  public class _AnyRandomNumberGenerator: RandomNumberGenerator {
-    private(set) public var base: RandomNumberGenerator
-
-    public init(_ base: RandomNumberGenerator) {
-      self.base = base
-    }
-
-    public func next() -> UInt64 {
-      self.base.next()
-    }
-  }
 }
diff --git a/Sources/Dependencies/Internal/RuntimeWarnings.swift b/Sources/Dependencies/Internal/RuntimeWarnings.swift
@@ -11,7 +11,7 @@ func runtimeWarn(
     let message = message()
     let category = category ?? "Runtime Warning"
     if _XCTIsTesting {
-      if let file = file, let line = line {
+      if let file, let line {
         XCTFail(message, file: file, line: line)
       } else {
         XCTFail(message)

diff --git a/Sources/DependenciesMacrosPlugin/Support.swift b/Sources/DependenciesMacrosPlugin/Support.swift
@@ -230,9 +230,9 @@ extension MacroExpansionContext {
   }
 }
 
-extension Array where Element == String {
+extension Array<String> {
   func qualified(_ module: String) -> Self {
-    self.flatMap { [$0, "\(module).\($0)"] }
+    flatMap { [$0, "\(module).\($0)"] }
   }
 }