Merge pull request #67056 from DougGregor/rename-observation-module-5.9

[5.9] [SE-0395] Rename _Observation module to Observation

Author: DougGregor

include/swift/AST/KnownIdentifiers.def

@@ -126,7 +126,6 @@ IDENTIFIER(objectForKeyedSubscript)
 IDENTIFIER(ObjectiveC)
 IDENTIFIER_(ObjectiveCType)
 IDENTIFIER(Observation)
-IDENTIFIER_WITH_NAME(Observation_, "_Observation")
 IDENTIFIER(oldValue)
 IDENTIFIER(Optional)
 IDENTIFIER_(OptionalNilComparisonType)

lib/AST/NameLookup.cpp

@@ -680,11 +680,8 @@ static void recordShadowedDeclsAfterTypeMatch(
         }
       }
 
-      // Next, prefer any other module over the (_)Observation module.
-      auto obsModule = ctx.getLoadedModule(ctx.Id_Observation);
-      if (!obsModule)
-        obsModule = ctx.getLoadedModule(ctx.Id_Observation_);
-      if (obsModule) {
+      // Next, prefer any other module over the Observation module.
+      if (auto obsModule = ctx.getLoadedModule(ctx.Id_Observation)) {
         if ((firstModule == obsModule) != (secondModule == obsModule)) {
           // If second module is (_)Observation, then it is shadowed by
           // first.

lib/Macros/Sources/ObservationMacros/ObservableMacro.swift

@@ -17,7 +17,7 @@ import SwiftSyntaxMacros
 @_implementationOnly import SwiftSyntaxBuilder
 
 public struct ObservableMacro {
-  static let moduleName = "_Observation"
+  static let moduleName = "Observation"
 
   static let conformanceName = "Observable"
   static var qualifiedConformanceName: String {

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

@@ -12,7 +12,7 @@
 
 list(APPEND swift_runtime_library_compile_flags -I${SWIFT_SOURCE_DIR}/stdlib/include -I${SWIFT_SOURCE_DIR}/include)
 
-add_swift_target_library(swift_Observation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+add_swift_target_library(swiftObservation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   Locking.cpp
   Locking.swift
   Observable.swift

test/ModuleInterface/Observable.swift

@@ -9,7 +9,7 @@
 // REQUIRES: swift_swift_parser
 // REQUIRES: observation
 
-import _Observation
+import Observation
 
 // CHECK-NOT: @Observable
 // CHECK-NOT: @ObservationIgnored

test/NameLookup/Inputs/ReexportsObservation.swift

@@ -1,2 +1,2 @@
-@_exported import _Observation
+@_exported import Observation
 

test/NameLookup/observable_shadowing.swift

@@ -11,7 +11,7 @@ import HasObservable
 #if VIA_REEXPORT
 import ReexportsObservation
 #else
-import _Observation
+import Observation
 #endif
 
 func foo() -> Observable<Int> {

test/stdlib/Observation/Observable.swift

@@ -10,7 +10,7 @@
 // REQUIRES: objc_interop
 
 import StdlibUnittest
-import _Observation
+import Observation
 
 @usableFromInline
 @inline(never)

test/stdlib/Observation/ObservableDidSetWillSet.swift

@@ -11,7 +11,7 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
-import _Observation
+import Observation
 
 @Observable
 public class Model {