Fix spelling mistake for ObservationRegistrar

Author: phausler

lib/Macros/Sources/ObservationMacros/CMakeLists.txt

@@ -21,10 +21,8 @@ add_library("${library_name}" SHARED
 
 set_target_properties(${library_name}
   PROPERTIES
-    PREFIX ""
-    SUFFIX ".lib"
-    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}"
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}"
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}/plugins"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}/plugins"
 )
 
 if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
@@ -89,5 +87,5 @@ swift_install_in_component(TARGETS "${library_name}"
     COMPONENT compiler)
 
 swift_install_in_component(DIRECTORY "${module_base}"
-                           DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}"
+                           DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}/plugins"
                            COMPONENT compiler)

lib/Macros/Sources/ObservationMacros/ObservableMacro.swift

@@ -17,7 +17,19 @@ private extension DeclSyntaxProtocol {
   }
 }
 
-public struct ObservableMacro: MemberMacro, MemberAttributeMacro {
+public struct ObservableMacro: MemberMacro, MemberAttributeMacro, ConformanceMacro {
+  // MARK: - ConformanceMacro
+  public static func expansion<
+    Declaration: DeclGroupSyntax,
+    Context: MacroExpansionContext
+  >(
+    of node: AttributeSyntax,
+    providingConformancesOf declaration: Declaration,
+    in context: Context
+  ) throws -> [(TypeSyntax, GenericWhereClauseSyntax?)] {
+    let protocolName: TypeSyntax = "Observable"
+    return [(protocolName, nil)]
+  }
 
   // MARK: - MemberMacro
   public static func expansion(

stdlib/public/Observation/Sources/Observation/CMakeLists.txt

@@ -16,16 +16,15 @@ list(APPEND swift_runtime_library_compile_flags  -I${SWIFT_SOURCE_DIR}/include)
 
 list(APPEND SWIFT_OBSERVATION_SWIFT_FLAGS
   "-enable-experimental-feature" "Macros"
-  "-load-plugin-library"
-  ${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY}/ObservationMacros.lib)
+)
 
 add_swift_target_library(swiftObservation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   KeyPaths.swift
   Locking.cpp
   Locking.swift
   Macros.swift
   Observable.swift
-  ObservationRegistar.swift
+  ObservationRegistrar.swift
   ObservationTracking.swift
   ObservedChanges.swift
   ObservedTransactions.swift

stdlib/public/Observation/Sources/Observation/Macros.swift

@@ -13,6 +13,7 @@
 @available(SwiftStdlib 5.9, *)
 @attached(member)
 @attached(memberAttribute)
+@attached(conformance)
 public macro Observable() = #externalMacro(module: "ObservationMacros", type: "ObservableMacro")
 
 @available(SwiftStdlib 5.9, *)

stdlib/public/Observation/Sources/Observation/ObservationRegistar.swift renamed to stdlib/public/Observation/Sources/Observation/ObservationRegistrar.swift

@@ -12,7 +12,7 @@
 import _Concurrency
 
 @available(SwiftStdlib 5.9, *)
-public struct ObservationRegistar<Subject: Observable>: Sendable {
+public struct ObservationRegistrar<Subject: Observable>: Sendable {
   enum Phase {
     case willSet
     case didSet

stdlib/public/Observation/Sources/Observation/ObservationTracking.swift

@@ -16,7 +16,7 @@ public struct ObservationTracking {
     let remove: @Sendable (Int) -> Void
     var rawKeyPaths = Set<AnyKeyPath>()
 
-    init<Subject: Observable>(_ context: ObservationRegistar<Subject>.Context) {
+    init<Subject: Observable>(_ context: ObservationRegistrar<Subject>.Context) {
       emit = { rawKeyPaths, observer in
         context.nextTracking(for: KeyPaths(raw: rawKeyPaths), observer)
       }
@@ -41,7 +41,7 @@ public struct ObservationTracking {
   struct AccessList {
     var entries = [ObjectIdentifier : Entry]()
 
-    mutating func addAccess<Subject: Observable>(keyPath: PartialKeyPath<Subject>, context: ObservationRegistar<Subject>.Context) {
+    mutating func addAccess<Subject: Observable>(keyPath: PartialKeyPath<Subject>, context: ObservationRegistrar<Subject>.Context) {
       entries[context.id, default: Entry(context)].insert(keyPath)
     }
   }

stdlib/public/Observation/Sources/Observation/ObservedChanges.swift

@@ -13,10 +13,10 @@ import _Concurrency
 
 @available(SwiftStdlib 5.9, *)
 public struct ObservedChanges<Subject: Observable, Element: Sendable> {
-  let context: ObservationRegistar<Subject>.Context
+  let context: ObservationRegistrar<Subject>.Context
   let keyPath: KeyPath<Subject, Element>
 
-  init(_ context: ObservationRegistar<Subject>.Context, keyPath: KeyPath<Subject, Element>) {
+  init(_ context: ObservationRegistrar<Subject>.Context, keyPath: KeyPath<Subject, Element>) {
     self.context = context
     self.keyPath = keyPath
   }
@@ -25,11 +25,11 @@ public struct ObservedChanges<Subject: Observable, Element: Sendable> {
 @available(SwiftStdlib 5.9, *)
 extension ObservedChanges: AsyncSequence {
   public struct Iterator: AsyncIteratorProtocol {
-    let context: ObservationRegistar<Subject>.Context
+    let context: ObservationRegistrar<Subject>.Context
     let keyPath: KeyPath<Subject, Element>
     let keyPaths: KeyPaths<Subject>
 
-    init(_ context: ObservationRegistar<Subject>.Context, keyPath: KeyPath<Subject, Element>) {
+    init(_ context: ObservationRegistrar<Subject>.Context, keyPath: KeyPath<Subject, Element>) {
       self.context = context
       self.keyPath = keyPath
       keyPaths = Subject.dependencies(of: keyPath)

stdlib/public/Observation/Sources/Observation/ObservedTransactions.swift

@@ -13,11 +13,11 @@ import _Concurrency
 
 @available(SwiftStdlib 5.9, *)
 public struct ObservedTransactions<Subject: Observable, Delivery: Actor> {
-  let context: ObservationRegistar<Subject>.Context
+  let context: ObservationRegistrar<Subject>.Context
   let keyPaths: KeyPaths<Subject>
   let isolation: Delivery
 
-  init(_ context: ObservationRegistar<Subject>.Context, keyPaths: KeyPaths<Subject>, isolation: Delivery) {
+  init(_ context: ObservationRegistrar<Subject>.Context, keyPaths: KeyPaths<Subject>, isolation: Delivery) {
     self.context = context
     self.keyPaths = keyPaths
     self.isolation = isolation
@@ -29,11 +29,11 @@ extension ObservedTransactions: AsyncSequence {
   public typealias Element = KeyPaths<Subject>
 
   public struct Iterator: AsyncIteratorProtocol {
-    let context: ObservationRegistar<Subject>.Context
+    let context: ObservationRegistrar<Subject>.Context
     let keyPaths: KeyPaths<Subject>
     let isolation: Delivery
 
-    init(_ context: ObservationRegistar<Subject>.Context, keyPaths: KeyPaths<Subject>, isolation: Delivery) {
+    init(_ context: ObservationRegistrar<Subject>.Context, keyPaths: KeyPaths<Subject>, isolation: Delivery) {
       self.context = context
       self.keyPaths = keyPaths
       self.isolation = isolation