Minor tweaks

sindresorhus · Feb 22, 2025 · cc938ec · cc938ec
1 parent 6740756
commit cc938ec
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/Sources/Defaults/Defaults+iCloud.swift b/Sources/Defaults/Defaults+iCloud.swift
@@ -236,12 +236,12 @@ final class iCloudSynchronizer {
 	/**
 	A thread-safe `keys` that manage the keys to be synced.
 	*/
-	@Atomic(value: []) private(set) var keys: Set<Defaults.Keys>
+	@_DefaultsAtomic(value: []) private(set) var keys: Set<Defaults.Keys>
 
 	/**
 	A thread-safe synchronization status monitor for `keys`.
 	*/
-	@Atomic(value: []) private var remoteSyncingKeys: Set<Defaults.Keys>
+	@_DefaultsAtomic(value: []) private var remoteSyncingKeys: Set<Defaults.Keys>
 
 	// TODO: Replace it with async stream when Swift supports custom executors.
 	private lazy var localKeysMonitor: Defaults.CompositeDefaultsObservation = .init { [weak self] pair, _ in

diff --git a/Sources/Defaults/Defaults.swift b/Sources/Defaults/Defaults.swift
@@ -274,7 +274,7 @@ extension Defaults {
 		_ key: Key<Value>,
 		initial: Bool = true
 	) -> AsyncStream<Value> { // TODO: Make this `some AsyncSequence<Value>` when targeting macOS 15.
-		.init { continuation in
+		AsyncStream { continuation in
 			let observation = DefaultsObservation(object: key.suite, key: key.name) { _, change in
 				// TODO: Use the `.deserialize` method directly.
 				let value = KeyChange(change: change, defaultValue: key.defaultValue).newValue
@@ -306,11 +306,12 @@ extension Defaults {
 	}
 	```
 	*/
+	@_disfavoredOverload
 	public static func updates<each Value: Serializable>(
 		_ keys: repeat Key<each Value>,
 		initial: Bool = true
 	) -> AsyncStream<(repeat each Value)> {
-		.init { continuation in
+		AsyncStream { continuation in
 			func getCurrentValues() -> (repeat each Value) {
 				(repeat self[each keys])
 			}
@@ -364,7 +365,7 @@ extension Defaults {
 		_ keys: [_AnyKey],
 		initial: Bool = true
 	) -> AsyncStream<Void> { // TODO: Make this `some AsyncSequence<Void>` when targeting macOS 15.
-		.init { continuation in
+		AsyncStream { continuation in
 			let observations = keys.indexed().map { index, key in
 				let observation = DefaultsObservation(object: key.suite, key: key.name) { _, _ in
 					continuation.yield()

diff --git a/Sources/Defaults/Observation.swift b/Sources/Defaults/Observation.swift
@@ -218,7 +218,7 @@ extension Defaults {
 
 			let key = preventPropagationThreadDictionaryKey
 			let updatingValuesFlag = (Thread.current.threadDictionary[key] as? Bool) ?? false
-			if updatingValuesFlag {
+			guard !updatingValuesFlag else {
 				return
 			}
 

diff --git a/Sources/Defaults/UserDefaults.swift b/Sources/Defaults/UserDefaults.swift
@@ -9,7 +9,7 @@ extension UserDefaults {
 		return Value.toValue(anyObject)
 	}
 
-	 func _set<Value: Defaults.Serializable>(_ key: String, to value: Value) {
+	func _set<Value: Defaults.Serializable>(_ key: String, to value: Value) {
 		if (value as? (any _DefaultsOptionalProtocol))?._defaults_isNil == true {
 			removeObject(forKey: key)
 			return

diff --git a/Sources/Defaults/Utilities.swift b/Sources/Defaults/Utilities.swift
@@ -381,7 +381,7 @@ final class TaskQueue {
 
 // TODO: Replace with Swift 6 native Atomics support: https://github.com/apple/swift-evolution/blob/main/proposals/0258-property-wrappers.md?rgh-link-date=2024-03-29T14%3A14%3A00Z#changes-from-the-accepted-proposal
 @propertyWrapper
-final class Atomic<Value> {
+final class _DefaultsAtomic<Value> {
 	private let lock: Lock = .make()
 	private var _value: Value