encode(_:output:) => encode(_:sendingOutputTo processCodeUnit:)

Author: Dave Abrahams

stdlib/public/core/String.swift

@@ -468,8 +468,7 @@ extension String {
     Encoding: UnicodeCodec
   >(_ encoding: Encoding.Type) -> Int {
     var codeUnitCount = 0
-    let output: (Encoding.CodeUnit) -> Void = { _ in codeUnitCount += 1 }
-    self._encode(encoding, output: output)
+    self._encode(encoding, sendingOutputTo: { _ in codeUnitCount += 1 })
     return codeUnitCount
   }
 
@@ -482,9 +481,11 @@ extension String {
   // with unpaired surrogates
   func _encode<
     Encoding: UnicodeCodec
-  >(_ encoding: Encoding.Type, output: @noescape (Encoding.CodeUnit) -> Void)
-  {
-    return _core.encode(encoding, output: output)
+  >(
+    _ encoding: Encoding.Type,
+    sendingOutputTo processCodeUnit: @noescape (Encoding.CodeUnit) -> Void
+  ) {
+    return _core.encode(encoding, sendingOutputTo: processCodeUnit)
   }
 }
 

stdlib/public/core/StringCore.swift

@@ -329,17 +329,17 @@ public struct _StringCore {
   }
 
   /// Write the string, in the given encoding, to output.
-  func encode<
-    Encoding: UnicodeCodec
-  >(_ encoding: Encoding.Type, output: @noescape (Encoding.CodeUnit) -> Void)
+  func encode<Encoding: UnicodeCodec>(
+    _ encoding: Encoding.Type,
+    sendingOutputTo processCodeUnit: @noescape (Encoding.CodeUnit) -> Void)
   {
     if _fastPath(_baseAddress != nil) {
       if _fastPath(elementWidth == 1) {
         for x in UnsafeBufferPointer(
           start: UnsafeMutablePointer<UTF8.CodeUnit>(_baseAddress!),
           count: count
         ) {
-          Encoding.encode(UnicodeScalar(UInt32(x)), sendingOutputTo: output)
+          Encoding.encode(UnicodeScalar(UInt32(x)), sendingOutputTo: processCodeUnit)
         }
       }
       else {
@@ -351,7 +351,7 @@ public struct _StringCore {
           from: UTF16.self,
           to: encoding,
           stoppingOnError: true,
-          sendingOutputTo: output
+          sendingOutputTo: processCodeUnit
         )
         _sanityCheck(!hadError, "Swift.String with native storage should not have unpaired surrogates")
       }
@@ -361,7 +361,7 @@ public struct _StringCore {
       _StringCore(
         _cocoaStringToContiguous(
           source: cocoaBuffer!, range: 0..<count, minimumCapacity: 0)
-      ).encode(encoding, output: output)
+      ).encode(encoding, sendingOutputTo: processCodeUnit)
 #else
       _sanityCheckFailure("encode: non-native string without objc runtime")
 #endif