From fb8f3907338ef44293ff625ab54fc50f3bc6f67b Mon Sep 17 00:00:00 2001 From: Evan Hahn Date: Mon, 19 Dec 2022 13:46:41 -0600 Subject: [PATCH] Remove unnecessary `swiftlint:disable`s In a48049f44f8fba8b6e10f285df625176a66b3066, we disabled some Swiftlint rules due to a Swiftlint bug. This reverts that commit because it [appears the bug has been fixed][0]. [0]: https://github.com/realm/SwiftLint/blob/7bd8362dae8a95dcdbabbfcee454bb1a45764d3f/CHANGELOG.md#0503-bundle-of-towels --- .../src/Storage/Database/GRDBDatabaseStorageAdapter.swift | 6 ------ 1 file changed, 6 deletions(-) diff --git a/SignalServiceKit/src/Storage/Database/GRDBDatabaseStorageAdapter.swift b/SignalServiceKit/src/Storage/Database/GRDBDatabaseStorageAdapter.swift index faa951ec15..0685600984 100644 --- a/SignalServiceKit/src/Storage/Database/GRDBDatabaseStorageAdapter.swift +++ b/SignalServiceKit/src/Storage/Database/GRDBDatabaseStorageAdapter.swift @@ -480,7 +480,6 @@ extension GRDBDatabaseStorageAdapter: SDSDatabaseStorageAdapter { public func read(block: (GRDBReadTransaction) throws -> T) throws -> T { #if TESTABLE_BUILD - // swiftlint:disable inert_defer owsAssertDebug(Self.canOpenTransaction) // Check for nested tractions. if Self.detectNestedTransactions { @@ -492,7 +491,6 @@ extension GRDBDatabaseStorageAdapter: SDSDatabaseStorageAdapter { Self.canOpenTransaction = true } } - // swiftlint:enable inert_defer #endif return try pool.read { database in @@ -524,7 +522,6 @@ extension GRDBDatabaseStorageAdapter: SDSDatabaseStorageAdapter { public func read(block: (GRDBReadTransaction) -> Void) throws { #if TESTABLE_BUILD - // swiftlint:disable inert_defer owsAssertDebug(Self.canOpenTransaction) if Self.detectNestedTransactions { // Check for nested tractions. @@ -535,7 +532,6 @@ extension GRDBDatabaseStorageAdapter: SDSDatabaseStorageAdapter { Self.canOpenTransaction = true } } - // swiftlint:enable inert_defer #endif try pool.read { database in @@ -549,7 +545,6 @@ extension GRDBDatabaseStorageAdapter: SDSDatabaseStorageAdapter { public func write(block: (GRDBWriteTransaction) -> Void) throws { #if TESTABLE_BUILD - // swiftlint:disable inert_defer owsAssertDebug(Self.canOpenTransaction) // Check for nested tractions. if Self.detectNestedTransactions { @@ -561,7 +556,6 @@ extension GRDBDatabaseStorageAdapter: SDSDatabaseStorageAdapter { Self.canOpenTransaction = true } } - // swiftlint:enable inert_defer #endif var syncCompletions: [GRDBWriteTransaction.CompletionBlock] = []