tweaked local var names to avoid confusion with self's properties

Author: airspeedswift

stdlib/public/core/ArrayBufferProtocol.swift

@@ -73,7 +73,7 @@ internal protocol _ArrayBufferProtocol
   /// - Precondition: This buffer is backed by a uniquely-referenced
   /// `_ContiguousArrayBuffer`.
   mutating func replaceSubrange<C>(
-    _ subRange: Range<Int>,
+    _ subrange: Range<Int>,
     with newCount: Int,
     elementsOf newValues: C
   ) where C : Collection, C.Iterator.Element == Element
@@ -134,32 +134,32 @@ extension _ArrayBufferProtocol {
   }
 
   internal mutating func replaceSubrange<C>(
-    _ subRange: Range<Int>,
+    _ subrange: Range<Int>,
     with newCount: Int,
     elementsOf newValues: C
   ) where C : Collection, C.Iterator.Element == Element {
     _sanityCheck(startIndex == 0, "_SliceBuffer should override this function.")
     let oldCount = self.count
-    let eraseCount = subRange.count
+    let eraseCount = subrange.count
 
     let growth = newCount - eraseCount
     self.count = oldCount + growth
 
     let elements = self.subscriptBaseAddress
-    let oldTailIndex = subRange.upperBound
+    let oldTailIndex = subrange.upperBound
     let oldTailStart = elements + oldTailIndex
     let newTailIndex = oldTailIndex + growth
     let newTailStart = oldTailStart + growth
-    let tailCount = oldCount - subRange.upperBound
+    let tailCount = oldCount - subrange.upperBound
 
     if growth > 0 {
       // Slide the tail part of the buffer forwards, in reverse order
       // so as not to self-clobber.
       newTailStart.moveInitialize(from: oldTailStart, count: tailCount)
 
-      // Assign over the original subRange
+      // Assign over the original subrange
       var i = newValues.startIndex
-      for j in CountableRange(subRange) {
+      for j in CountableRange(subrange) {
         elements[j] = newValues[i]
         newValues.formIndex(after: &i)
       }
@@ -171,8 +171,8 @@ extension _ArrayBufferProtocol {
       _expectEnd(i, newValues)
     }
     else { // We're not growing the buffer
-      // Assign all the new elements into the start of the subRange
-      var i = subRange.lowerBound
+      // Assign all the new elements into the start of the subrange
+      var i = subrange.lowerBound
       var j = newValues.startIndex
       for _ in 0..<newCount {
         elements[i] = newValues[j]
@@ -202,7 +202,7 @@ extension _ArrayBufferProtocol {
         // Assign over the start of the replaced range with the tail
         newTailStart.moveAssign(from: oldTailStart, count: tailCount)
 
-        // Destroy elements remaining after the tail in subRange
+        // Destroy elements remaining after the tail in subrange
         (newTailStart + tailCount).deinitialize(
           count: shrinkage - tailCount)
       }

stdlib/public/core/Arrays.swift.gyb

@@ -1676,7 +1676,7 @@ extension _ArrayBufferProtocol {
   ) where C.Iterator.Element == Element {
 
     let growth = insertCount - bounds.count
-    let newCount = count + growth
+    let newCount = self.count + growth
     var newBuffer = _forceCreateUniqueMutableBuffer(
       newCount: newCount, requiredCapacity: newCount)
 
@@ -1866,7 +1866,6 @@ extension _ArrayBufferProtocol {
     _sanityCheck(requiredCapacity >= countForBuffer)
     _sanityCheck(minNewCapacity >= countForBuffer)
 
-    // FIXME(Typechecker): Swift. prefix shouldn't be necessary (rdar://problem/28947708)
     let minimumCapacity = Swift.max(requiredCapacity,
       minNewCapacity > capacity
          ? _growArrayCapacity(capacity) : capacity)
@@ -1996,8 +1995,7 @@ extension _ArrayBufferProtocol {
 
   internal mutating func _arrayReserve(_ minimumCapacity: Int) {
 
-    let count = self.count
-    // FIXME(Typechecker): shouldn't need Swift. here
+    let oldCount = self.count
     let requiredCapacity = Swift.max(count, minimumCapacity)
 
     if _fastPath(
@@ -2008,8 +2006,9 @@ extension _ArrayBufferProtocol {
     }
 
     var newBuffer = _forceCreateUniqueMutableBuffer(
-      newCount: count, requiredCapacity: requiredCapacity)
-    _arrayOutOfPlaceUpdate(&newBuffer, count, 0, _IgnorePointer())
+      newCount: oldCount, requiredCapacity: requiredCapacity)
+
+    _arrayOutOfPlaceUpdate(&newBuffer, oldCount, 0, _IgnorePointer())
   }
 
   /// Append items from `newItems` to a buffer.
@@ -2025,22 +2024,22 @@ extension _ArrayBufferProtocol {
     }
 
     // This will force uniqueness
-    var count = self.count
-    self._arrayReserve(count + 1)
+    var newCount = self.count
+    _arrayReserve(newCount + 1)
     while true {
-      let capacity = self.capacity
+      let currentCapacity = self.capacity
       let base = self.firstElementAddress
 
-      while (nextItem != nil) && count < capacity {
-        (base + count).initialize(to: nextItem!)
-        count += 1
+      while (nextItem != nil) && newCount < currentCapacity {
+        (base + newCount).initialize(to: nextItem!)
+        newCount += 1
         nextItem = stream.next()
       }
-      self.count = count
+      self.count = newCount
       if nextItem == nil {
         return
       }
-      self._arrayReserve(_growArrayCapacity(capacity))
+      self._arrayReserve(_growArrayCapacity(currentCapacity))
     }
   }
 }

stdlib/public/core/SliceBuffer.swift

@@ -79,8 +79,8 @@ internal struct _SliceBuffer<Element>
   /// - Precondition: This buffer is backed by a uniquely-referenced
   ///   `_ContiguousArrayBuffer` and
   ///   `insertCount <= numericCast(newValues.count)`.
-  internal mutating func replace<C>(
-    subRange: Range<Int>,
+  internal mutating func replaceSubrange<C>(
+    _ subrange: Range<Int>,
     with insertCount: Int,
     elementsOf newValues: C
   ) where C : Collection, C.Iterator.Element == Element {
@@ -90,7 +90,7 @@ internal struct _SliceBuffer<Element>
 
     _sanityCheck(_hasNativeBuffer && isUniquelyReferenced())
 
-    let eraseCount = subRange.count
+    let eraseCount = subrange.count
     let growth = insertCount - eraseCount
     let oldCount = count
 
@@ -99,8 +99,8 @@ internal struct _SliceBuffer<Element>
 
     _sanityCheck(native.count + growth <= native.capacity)
 
-    let start = subRange.lowerBound - startIndex + hiddenElementCount
-    let end = subRange.upperBound - startIndex + hiddenElementCount
+    let start = subrange.lowerBound - startIndex + hiddenElementCount
+    let end = subrange.upperBound - startIndex + hiddenElementCount
     native.replaceSubrange(
       start..<end,
       with: insertCount,