From 3f0f2fc775dc83e66e5a9a6a21e2a2fe4048994f Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 30 Oct 2024 21:57:06 -0700 Subject: [PATCH] Remove some no-longer-needed nonisolated(unsafe) marks for Loggers. (Not needed in Xcode 16.2b1.) --- Modules/Account/Sources/Account/AccountSyncError.swift | 2 +- Modules/FeedFinder/Sources/FeedFinder/FeedFinder.swift | 2 +- Modules/Images/Sources/Images/HTMLMetadataDownloader.swift | 2 +- Modules/Parser/Sources/Parser/HTMLParser/HTMLLinkParser.swift | 2 +- Shared/Extensions/CacheCleaner.swift | 2 +- Shared/ShareExtension/ExtensionFeedAddRequestFile.swift | 2 +- iOS/AppDelegate.swift | 2 +- iOS/ErrorHandler.swift | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Modules/Account/Sources/Account/AccountSyncError.swift b/Modules/Account/Sources/Account/AccountSyncError.swift index 6b3fa7682..366aad284 100644 --- a/Modules/Account/Sources/Account/AccountSyncError.swift +++ b/Modules/Account/Sources/Account/AccountSyncError.swift @@ -17,7 +17,7 @@ public struct AccountSyncError { // OSLog is supposedly Sendable and will be annotated that way in the future: // https://forums.developer.apple.com/forums/thread/747816 - nonisolated(unsafe) private static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Application") + private static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Application") public let account: Account public let error: Error diff --git a/Modules/FeedFinder/Sources/FeedFinder/FeedFinder.swift b/Modules/FeedFinder/Sources/FeedFinder/FeedFinder.swift index 9c29062f7..e84b0e33c 100644 --- a/Modules/FeedFinder/Sources/FeedFinder/FeedFinder.swift +++ b/Modules/FeedFinder/Sources/FeedFinder/FeedFinder.swift @@ -14,7 +14,7 @@ import os.log public final class FeedFinder { - nonisolated(unsafe) private static let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "FeedFinder") + private static let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "FeedFinder") public static func find(url: URL) async throws -> Set { diff --git a/Modules/Images/Sources/Images/HTMLMetadataDownloader.swift b/Modules/Images/Sources/Images/HTMLMetadataDownloader.swift index c3682736b..5a9f42710 100644 --- a/Modules/Images/Sources/Images/HTMLMetadataDownloader.swift +++ b/Modules/Images/Sources/Images/HTMLMetadataDownloader.swift @@ -15,7 +15,7 @@ public final class HTMLMetadataDownloader: Sendable { static let shared = HTMLMetadataDownloader() - nonisolated(unsafe) private static let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "HTMLMetadataDownloader") + private static let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "HTMLMetadataDownloader") private let debugLoggingEnabled = false private let cache = HTMLMetadataCache() private let attemptDatesLock = OSAllocatedUnfairLock(initialState: [String: Date]()) diff --git a/Modules/Parser/Sources/Parser/HTMLParser/HTMLLinkParser.swift b/Modules/Parser/Sources/Parser/HTMLParser/HTMLLinkParser.swift index baedb6ce7..2835f9e7c 100644 --- a/Modules/Parser/Sources/Parser/HTMLParser/HTMLLinkParser.swift +++ b/Modules/Parser/Sources/Parser/HTMLParser/HTMLLinkParser.swift @@ -12,7 +12,7 @@ import os public final class HTMLLinkParser { public private(set) var links = [HTMLLink]() - nonisolated(unsafe) private static let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "HTMLLinkParser") + private static let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "HTMLLinkParser") private let parserData: ParserData private let baseURL: URL? diff --git a/Shared/Extensions/CacheCleaner.swift b/Shared/Extensions/CacheCleaner.swift index ce54c587f..bb9d87b26 100644 --- a/Shared/Extensions/CacheCleaner.swift +++ b/Shared/Extensions/CacheCleaner.swift @@ -12,7 +12,7 @@ import Web struct CacheCleaner { - nonisolated(unsafe) static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CacheCleaner") + static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CacheCleaner") @MainActor static func purgeIfNecessary() { diff --git a/Shared/ShareExtension/ExtensionFeedAddRequestFile.swift b/Shared/ShareExtension/ExtensionFeedAddRequestFile.swift index f6fa39cef..d9bf00f4f 100644 --- a/Shared/ShareExtension/ExtensionFeedAddRequestFile.swift +++ b/Shared/ShareExtension/ExtensionFeedAddRequestFile.swift @@ -12,7 +12,7 @@ import Account final class ExtensionFeedAddRequestFile: NSObject, NSFilePresenter, Sendable { - nonisolated(unsafe) private static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "extensionFeedAddRequestFile") + private static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "extensionFeedAddRequestFile") private static let filePath: String = { let appGroup = Bundle.main.object(forInfoDictionaryKey: "AppGroup") as! String diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift index 136a7ed54..aee45fb10 100644 --- a/iOS/AppDelegate.swift +++ b/iOS/AppDelegate.swift @@ -37,7 +37,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationC } } - nonisolated(unsafe) let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Application") + let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Application") var userNotificationManager: UserNotificationManager! var extensionContainersFile: ExtensionContainersFile! diff --git a/iOS/ErrorHandler.swift b/iOS/ErrorHandler.swift index 5b6da08c3..affed60e4 100644 --- a/iOS/ErrorHandler.swift +++ b/iOS/ErrorHandler.swift @@ -11,7 +11,7 @@ import os.log struct ErrorHandler { - nonisolated(unsafe) private static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Application") + private static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Application") public static func present(_ viewController: UIViewController) -> @MainActor (Error) -> () {