Skip to content

fix: fix various typos #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swiftty merged 3 commits into from
May 13, 2026
Merged

fix: fix various typos #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdd9fa0
fix: fix various typos in Cache, DiskCache and LRUCache
swiftty May 13, 2026
8bdbf18
fix: fix typo in log message
swiftty May 13, 2026
db225f6
Remove await on async let
swiftty May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Sources/DataCacheKit/Cache.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ public actor Cache<Key: Hashable & Sendable, Value: Codable & Sendable>: Caching
}
}

private let onMemery: MemoryCache<Key, Value>
private let onMemory: MemoryCache<Key, Value>
private let onDisk: DiskCache<Key>

private var queueingTask: Task<Void, Never>?

public init(options: Options, logger: Logger = .init(.disabled)) {
self.onMemery = .init(options: options.forMemory, logger: logger)
self.onMemory = .init(options: options.forMemory, logger: logger)
self.onDisk = .init(options: options.forDisk, logger: logger)
self.options = options
self.logger = logger
Expand All @@ -40,7 +40,7 @@ public actor Cache<Key: Hashable & Sendable, Value: Codable & Sendable>: Caching
public func value(for key: Key) async throws -> Value? {
_ = await queueingTask?.result

if let value = await onMemery.value(for: key) {
if let value = await onMemory.value(for: key) {
return value
}

Expand All @@ -53,7 +53,7 @@ public actor Cache<Key: Hashable & Sendable, Value: Codable & Sendable>: Caching
return try decoder.decode(Value.self, from: data)
}()

await onMemery.store(value, for: key).value
await onMemory.store(value, for: key).value
return value
}

Expand All @@ -68,8 +68,8 @@ public actor Cache<Key: Hashable & Sendable, Value: Codable & Sendable>: Caching
private func _store(_ value: Value, for key: Key) -> Task<Void, Never> {
queueingTask.enqueueAndReplacing { [weak self] in
guard let self else { return }
async let memory: Void = await onMemery.store(value, for: key).value
async let disk: Void = await _storeToDisk(value, for: key)
async let memory: Void = onMemory.store(value, for: key).value
async let disk: Void = _storeToDisk(value, for: key)

await memory
await disk
Expand All @@ -87,8 +87,8 @@ public actor Cache<Key: Hashable & Sendable, Value: Codable & Sendable>: Caching
private func _remove(for key: Key) -> Task<Void, Never> {
queueingTask.enqueueAndReplacing { [weak self] in
guard let self else { return }
async let memory: Void = await onMemery.remove(for: key).value
async let disk: Void = await onDisk.remove(for: key).value
async let memory: Void = onMemory.remove(for: key).value
async let disk: Void = onDisk.remove(for: key).value

await memory
await disk
Expand All @@ -106,8 +106,8 @@ public actor Cache<Key: Hashable & Sendable, Value: Codable & Sendable>: Caching
private func _removeAll() -> Task<Void, Never> {
queueingTask.enqueueAndReplacing { [weak self] in
guard let self else { return }
async let memory: Void = await onMemery.removeAll().value
async let disk: Void = await onDisk.removeAll().value
async let memory: Void = onMemory.removeAll().value
async let disk: Void = onDisk.removeAll().value

await memory
await disk
Expand Down
6 changes: 3 additions & 3 deletions Sources/DataCacheKit/DiskCache.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ extension DiskCache {
group.addTask { [change] }
continue
}
let task = peformChange(change, with: url)
let task = performChange(change, with: url)
group.addTask {
do {
try await task.value
Expand All @@ -292,7 +292,7 @@ extension DiskCache {
}
}

private func peformChange(_ change: Staging<Key>.Change, with url: URL) -> Task<Void, any Error> {
private func performChange(_ change: Staging<Key>.Change, with url: URL) -> Task<Void, any Error> {
let task = Task {
do {
switch change.operation {
Expand Down Expand Up @@ -378,7 +378,7 @@ extension DiskCache {
try FileManager.default.removeItem(at: item.url)
size -= item.meta.totalFileAllocatedSize ?? 0
logger.debug(
"\(self.logKey)sweeped item: \(item.url.lastPathComponent), size: \(item.meta.totalFileAllocatedSize ?? 0)"
"\(self.logKey)swept item: \(item.url.lastPathComponent), size: \(item.meta.totalFileAllocatedSize ?? 0)"
)
return true
} catch {
Expand Down
8 changes: 4 additions & 4 deletions Sources/LRUCache/LRUCache.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public struct LRUCache<Key: Hashable & Sendable, Value: Sendable>: ~Copyable, Se
nonmutating set { entries.withLock { $0.countLimit = newValue } }
}

private let entries = OSAllocatedUnfairLock<Entiries>(initialState: .init())
private let entries = OSAllocatedUnfairLock<Entries>(initialState: .init())

public init() {}

Expand Down Expand Up @@ -45,8 +45,8 @@ public struct LRUCache<Key: Hashable & Sendable, Value: Sendable>: ~Copyable, Se
}

public func removeAllValues() {
entries.withLock { entiries in
entiries.removeAll()
entries.withLock { entries in
entries.removeAll()
}
}
}
Expand Down Expand Up @@ -83,7 +83,7 @@ private extension LRUCache {
}
}

struct Entiries: Sendable {
struct Entries: Sendable {
var values: [Key: CacheEntry] = [:]
var totalCost = 0
var totalCostLimit = 0
Expand Down