[stdlib] rename internal and private symbols

Author: glessard

stdlib/public/core/StringGuts.swift

@@ -420,7 +420,7 @@ extension _StringGuts {
 #if _runtime(_ObjC)
 extension _StringGuts {
 
-  private static var associationKey: UnsafeRawPointer {
+  private static var _associationKey: UnsafeRawPointer {
     struct AssociationKey {}
     // We never dereference this, we only use this address as a unique key
     return unsafe unsafeBitCast(
@@ -429,7 +429,7 @@ extension _StringGuts {
     )
   }
 
-  internal func getAssociatedStorage() -> __StringStorage? {
+  private func _getAssociatedStorage() -> __StringStorage? {
     _internalInvariant(_object.hasObjCBridgeableObject)
     let getter = unsafe unsafeBitCast(
       getGetAssociatedObjectPtr(),
@@ -441,7 +441,7 @@ extension _StringGuts {
 
     if let assocPtr = unsafe getter(
       _object.objCBridgeableObject,
-      Self.associationKey
+      Self._associationKey
     ) {
       let storage: __StringStorage
       storage = unsafe Unmanaged.fromOpaque(assocPtr).takeUnretainedValue()
@@ -450,7 +450,7 @@ extension _StringGuts {
     return nil
   }
 
-  internal func setAssociatedStorage(_ storage: __StringStorage) {
+  private func _setAssociatedStorage(_ storage: __StringStorage) {
     _internalInvariant(_object.hasObjCBridgeableObject)
     let setter = unsafe unsafeBitCast(
       getSetAssociatedObjectPtr(),
@@ -464,24 +464,24 @@ extension _StringGuts {
 
     unsafe setter(
       _object.objCBridgeableObject,
-      Self.associationKey,
+      Self._associationKey,
       storage,
       1 //OBJC_ASSOCIATION_RETAIN_NONATOMIC
     )
   }
 
-  internal func getOrAllocateAssociatedStorage() -> __StringStorage {
+  internal func _getOrAllocateAssociatedStorage() -> __StringStorage {
     _internalInvariant(_object.hasObjCBridgeableObject)
     let unwrapped: __StringStorage
     // libobjc already provides the necessary memory barriers for
     // double checked locking to be safe, per comments on
     // https://github.com/swiftlang/swift/pull/75148
-    if let storage = getAssociatedStorage() {
+    if let storage = _getAssociatedStorage() {
       unwrapped = storage
     } else {
       let lock = _object.objCBridgeableObject
       objc_sync_enter(lock)
-      if let storage  = getAssociatedStorage() {
+      if let storage  = _getAssociatedStorage() {
         unwrapped = storage
       } else {
         var contents = String.UnicodeScalarView()
@@ -494,7 +494,7 @@ extension _StringGuts {
         }
         _precondition(contents._guts._object.hasNativeStorage)
         unwrapped = (consume contents)._guts._object.nativeStorage
-        setAssociatedStorage(unwrapped)
+        _setAssociatedStorage(unwrapped)
       }
       defer { _fixLifetime(unwrapped) }
       objc_sync_exit(lock)

stdlib/public/core/StringUTF8View.swift

@@ -337,7 +337,7 @@ extension String.UTF8View {
 #if _runtime(_ObjC)
       // handle non-UTF8 Objective-C bridging cases here
       if !_guts.isFastUTF8 && _guts._object.hasObjCBridgeableObject {
-        let storage = _guts.getOrAllocateAssociatedStorage()
+        let storage = _guts._getOrAllocateAssociatedStorage()
         let (start, count) = unsafe (storage.start, storage.count)
         let span = unsafe Span(_unsafeStart: start, count: count)
         return unsafe _overrideLifetime(span, borrowing: self)