Skip to content

Commit 51ee397

Browse files
authored
Merge pull request #41 from lucabartoletti/fix-try-warnings-after-throws-removal
Remove unnecessary try from primaryKeyValues() call sites
2 parents 7b2c93c + 7bd9e59 commit 51ee397

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Sources/Blackbird/BlackbirdCache.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,13 +376,13 @@ extension Blackbird.Database {
376376
extension BlackbirdModel {
377377
internal func _saveCachedInstance(for database: Blackbird.Database) {
378378
let cacheLimit = Self.cacheLimit
379-
if cacheLimit > 0, let pkValues = try? self.primaryKeyValues(), pkValues.count == 1, let pk = try? Blackbird.Value.fromAny(pkValues.first!) {
379+
if cacheLimit > 0, case let pkValues = self.primaryKeyValues(), pkValues.count == 1, let pk = try? Blackbird.Value.fromAny(pkValues.first!) {
380380
database.cache.writeModel(tableName: Self.tableName, primaryKey: pk, instance: self, entryLimit: cacheLimit)
381381
}
382382
}
383383

384384
internal func _deleteCachedInstance(for database: Blackbird.Database) {
385-
if Self.cacheLimit > 0, let pkValues = try? self.primaryKeyValues(), pkValues.count == 1, let pk = try? Blackbird.Value.fromAny(pkValues.first!) {
385+
if Self.cacheLimit > 0, case let pkValues = self.primaryKeyValues(), pkValues.count == 1, let pk = try? Blackbird.Value.fromAny(pkValues.first!) {
386386
database.cache.deleteModel(tableName: Self.tableName, primaryKey: pk)
387387
}
388388
}

Sources/Blackbird/BlackbirdObservation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public final class BlackbirdModelQueryObserver<T: BlackbirdModel, R: Sendable> {
118118
extension BlackbirdModel {
119119
public typealias Observer = BlackbirdModelObserver<Self>
120120

121-
public var observer: Observer { Observer(multicolumnPrimaryKey: try! primaryKeyValues()) }
121+
public var observer: Observer { Observer(multicolumnPrimaryKey: primaryKeyValues()) }
122122
}
123123

124124
@available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)

Sources/Blackbird/BlackbirdSwiftUI.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ extension Blackbird {
199199

200200
public init(_ instance: T, updatesEnabled: Bool = true) {
201201
_instance = State(initialValue: instance)
202-
instanceObserver = BlackbirdModelInstanceChangeObserver<T>(primaryKeyValues: try! instance.primaryKeyValues().map { try! Blackbird.Value.fromAny($0) })
202+
instanceObserver = BlackbirdModelInstanceChangeObserver<T>(primaryKeyValues: instance.primaryKeyValues().map { try! Blackbird.Value.fromAny($0) })
203203
instanceObserver.updatesEnabled = updatesEnabled
204204
}
205205

0 commit comments

Comments
 (0)