Support Swift 6 mode (#65)
* Enable swift 6 mode * Attach Sendable * Stop async context because enumerator can use only synchronous contexts * Fix global shared mutable state for MustacheContentTypes * Revert "Fix global shared mutable state for MustacheContentTypes" This reverts commit d4ccc83e07aeb48f4aa4024b71eb8e5f70131bc5. * Use instead of lock * Support 5 and 6 versions * Lock on access in Swift 6 * Support 5.9 * Revert "Support 5.9" This reverts commit 9845b3bc448b2af7238c3ac88aabe6d764b2e667. * Fix 5.9 compatibility * Unify to manage the same lock logic in 5.9 and 6 * Add withLock backport in NSLock
This commit is contained in:
@@ -12,6 +12,8 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Protocol for content types
|
||||
public protocol MustacheContentType: Sendable {
|
||||
/// escape text for this content type eg for HTML replace "<" with "<"
|
||||
@@ -38,8 +40,13 @@ struct HTMLContentType: MustacheContentType {
|
||||
/// the content type required. The default available types are `TEXT` and `HTML`. You can register your own
|
||||
/// with `MustacheContentTypes.register`.
|
||||
public enum MustacheContentTypes {
|
||||
|
||||
private static let lock = NSLock()
|
||||
|
||||
static func get(_ name: String) -> MustacheContentType? {
|
||||
self.types[name]
|
||||
lock.withLock {
|
||||
self.types[name]
|
||||
}
|
||||
}
|
||||
|
||||
/// Register new content type
|
||||
@@ -47,11 +54,19 @@ public enum MustacheContentTypes {
|
||||
/// - contentType: Content type
|
||||
/// - name: String to identify it
|
||||
public static func register(_ contentType: MustacheContentType, named name: String) {
|
||||
self.types[name] = contentType
|
||||
lock.withLock {
|
||||
self.types[name] = contentType
|
||||
}
|
||||
}
|
||||
|
||||
static var types: [String: MustacheContentType] = [
|
||||
private static let _types: [String: MustacheContentType] = [
|
||||
"HTML": HTMLContentType(),
|
||||
"TEXT": TextContentType(),
|
||||
]
|
||||
|
||||
#if compiler(>=6.0)
|
||||
nonisolated(unsafe) static var types: [String: MustacheContentType] = _types
|
||||
#else
|
||||
static var types: [String: MustacheContentType] = _types
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user