Merge pull request #1607 from apple/swift-3-api-guidelines

Applying API guidelines to The Standard Library

Author: moiseev

benchmark/single-source/AngryPhonebook.swift

@@ -36,7 +36,7 @@ public func run_AngryPhonebook(N: Int) {
   for _ in 1...N {
     for firstname in words {
       for lastname in words {
-        (firstname.uppercaseString, lastname.lowercaseString)
+        (firstname.uppercased, lastname.lowercased)
       }
     }
   }

benchmark/single-source/ArrayInClass.swift

@@ -14,7 +14,7 @@ class ArrayContainer {
   final var arr : [Int]
 
   init() {
-    arr = [Int] (count: 100_000, repeatedValue: 0)
+    arr = [Int] (repeating: 0, count: 100_000)
   }
 
   func runLoop(N: Int) {

benchmark/single-source/ArrayOfGenericPOD.swift

@@ -22,7 +22,7 @@ class RefArray<T> {
   var array : [T]
 
   init(_ i:T) {
-    array = [T](count: 100000, repeatedValue: i)
+    array = [T](repeating: i, count: 100000)
   }
 }
 

benchmark/single-source/ArrayOfGenericRef.swift

@@ -59,7 +59,7 @@ class RefArray<T> {
   var array : [T]
 
   init(_ i:T, count:Int = 10_000) {
-    array = [T](count: count, repeatedValue: i)
+    array = [T](repeating: i, count: count)
   }
 }
 

benchmark/single-source/ArrayOfPOD.swift

@@ -20,7 +20,7 @@ class RefArray<T> {
   var array : [T]
 
   init(_ i:T, count:Int = 100_000) {
-    array = [T](count: count, repeatedValue: i)
+    array = [T](repeating: i, count: count)
   }
 }
 

benchmark/single-source/ArrayOfRef.swift

@@ -71,7 +71,7 @@ class RefArray<T> {
   var array : [T]
 
   init(_ i:T, count:Int = 10_000) {
-    array = [T](count: count, repeatedValue: i)
+    array = [T](repeating: i, count: count)
   }
 }
 

benchmark/single-source/ArraySubscript.swift

@@ -22,7 +22,7 @@ public func run_ArraySubscript(N: Int) {
 
   func bound(x: Int) -> Int { return min(x, numArrayElements-1) }
 
-  var arrays = [[Int]](count: numArrays, repeatedValue: [])
+  var arrays = [[Int]](repeating: [], count: numArrays)
   for i in 0..<numArrays {
     for _ in 0..<numArrayElements {
       arrays[i].append(Int(truncatingBitPattern: Random()))

benchmark/single-source/CaptureProp.swift

@@ -15,13 +15,13 @@ func sum(x:Int, y:Int) -> Int {
 }
 
 @inline(never)
-func benchCaptureProp<S : SequenceType
+func benchCaptureProp<S : Sequence
 >(
-  s:S, _ f:(S.Generator.Element, S.Generator.Element)->S.Generator.Element) -> S.Generator.Element {
+  s:S, _ f:(S.Iterator.Element, S.Iterator.Element)->S.Iterator.Element) -> S.Iterator.Element {
 
-  var g = s.generate()
-  let initial = g.next()!
-  return GeneratorSequence(g).reduce(initial, combine: f)
+  var it = s.makeIterator()
+  let initial = it.next()!
+  return IteratorSequence(it).reduce(initial, combine: f)
 }
 
 public func run_CaptureProp(N: Int) {

benchmark/single-source/DictionaryRemove.swift

@@ -31,7 +31,7 @@ public func run_DictionaryRemove(N: Int) {
         tmpDict = dict
         // Empty dictionary
         for i in 1...size {
-            tmpDict.removeValueForKey(i)
+            tmpDict.removeValue(forKey: i)
         }
         if !tmpDict.isEmpty {
             break

benchmark/single-source/ErrorHandling.swift

@@ -12,7 +12,7 @@
 
 import TestsUtils
 
-enum PizzaError : ErrorType {
+enum PizzaError : ErrorProtocol {
   case Pepperoni, Olives, Anchovy
 }
 

benchmark/single-source/Hash.swift

@@ -64,7 +64,7 @@ class Hash {
   // Hash state:
   final var messageLength : Int = 0
   final var dataLength : Int = 0
-  final var data = [UInt8](count: 64, repeatedValue: 0)
+  final var data = [UInt8](repeating: 0, count: 64)
   final var blocksize : Int
 
   /// \brief Hash the internal data.
@@ -223,7 +223,7 @@ class MD5 : Hash {
     return first | second | third | fourth
   }
 
-  var w = [UInt32](count: 16, repeatedValue: 0)
+  var w = [UInt32](repeating: 0, count: 16)
   override
   func hash() {
     assert(dataLength == blocksize, "Invalid block size")
@@ -362,7 +362,7 @@ class SHA1 : Hash {
     assert(dataLength == blocksize, "Invalid block size")
 
     // Init the "W" buffer.
-    var w = [UInt32](count: 80, repeatedValue: 0)
+    var w = [UInt32](repeating: 0, count: 80)
 
     // Convert the Byte array to UInt32 array.
     var word : UInt32 = 0
@@ -497,7 +497,7 @@ class SHA256 :  Hash {
     assert(dataLength == blocksize, "Invalid block size")
 
     // Init the "W" buffer.
-    var w = [UInt32](count: 64, repeatedValue: 0)
+    var w = [UInt32](repeating: 0, count: 64)
 
     // Convert the Byte array to UInt32 array.
     var word : UInt32 = 0

benchmark/single-source/Histogram.swift

@@ -16,11 +16,11 @@ import TestsUtils
 
 typealias rrggbb_t = UInt32
 
-func output_sorted_sparse_rgb_histogram<S: SequenceType where S.Generator.Element == rrggbb_t>(samples: S, _ N: Int) {
+func output_sorted_sparse_rgb_histogram<S: Sequence where S.Iterator.Element == rrggbb_t>(samples: S, _ N: Int) {
   var histogram = Dictionary<rrggbb_t, Int>()
   for  _ in 1...50*N {
     for sample in samples {   // This part is really awful, I agree
-      let i = histogram.indexForKey(sample)
+      let i = histogram.index(forKey: sample)
       histogram[sample] = (i != nil ? histogram[i!].1 : 0) + 1
     }
   }

benchmark/single-source/Join.swift

@@ -19,6 +19,6 @@ public func run_Join(N: Int) {
   for x in 0..<1000 * N {
     array.append(String(x))
   }
-  _ = array.joinWithSeparator("")
-  _ = array.joinWithSeparator(" ")
+  _ = array.joined(separator: "")
+  _ = array.joined(separator: " ")
 }

benchmark/single-source/Memset.swift

@@ -21,7 +21,7 @@ func memset(a: inout [Int], _ c: Int) {
 
 @inline(never)
 public func run_Memset(N: Int) {
-  var a = [Int](count: 10_000, repeatedValue: 0)
+  var a = [Int](repeating: 0, count: 10_000)
   for _ in 1...50*N {
     memset(&a, 1)
     memset(&a, 0)

benchmark/single-source/MonteCarloE.swift

@@ -21,7 +21,7 @@ import TestsUtils
 
 public func run_MonteCarloE(scale: Int) {
   let N = 200000*scale
-  var intervals = [Bool](count: N, repeatedValue: false)
+  var intervals = [Bool](repeating: false, count: N)
   for _ in 1...N {
     let pos = Int(UInt(truncatingBitPattern: Random())%UInt(N))
     intervals[pos] = true

benchmark/single-source/NSStringConversion.swift

@@ -15,7 +15,7 @@ import TestsUtils
 import Foundation
 
 public func run_NSStringConversion(N: Int) {
-let test:NSString = NSString(CString: "test", encoding: NSASCIIStringEncoding)!
+let test:NSString = NSString(cString: "test", encoding: NSASCIIStringEncoding)!
   for _ in 1...N * 10000 {
     test as String
   }

benchmark/single-source/Phonebook.swift

@@ -69,6 +69,6 @@ public func run_Phonebook(N: Int) {
   }
   for _ in 1...N {
     var t = Names;
-    t.sortInPlace()
+    t.sort()
   }
 }

benchmark/single-source/PopFront.swift

@@ -17,15 +17,15 @@ let arrayCount = 1024
 
 @inline(never)
 public func run_PopFrontArray(N: Int) {
-  let orig = Array(count: arrayCount, repeatedValue: 1)
+  let orig = Array(repeating: 1, count: arrayCount)
   var a = [Int]()
   for _ in 1...20*N {
     for _ in 1...reps {
       var result = 0
-      a.appendContentsOf(orig)
+      a.append(contentsOf: orig)
       while a.count != 0 {
         result += a[0]
-        a.removeAtIndex(0)
+        a.remove(at: 0)
       }
       CheckResults(result == arrayCount, "IncorrectResults in StringInterpolation: \(result) != \(arrayCount)")
     }
@@ -34,8 +34,8 @@ public func run_PopFrontArray(N: Int) {
 
 @inline(never)
 public func run_PopFrontUnsafePointer(N: Int) {
-  var orig = Array(count: arrayCount, repeatedValue: 1)
-  let a = UnsafeMutablePointer<Int>.alloc(arrayCount)
+  var orig = Array(repeating: 1, count: arrayCount)
+  let a = UnsafeMutablePointer<Int>(allocatingCapacity: arrayCount)
   for _ in 1...100*N {
     for _ in 1...reps {
       for i in 0..<arrayCount {
@@ -51,6 +51,6 @@ public func run_PopFrontUnsafePointer(N: Int) {
       CheckResults(result == arrayCount, "IncorrectResults in StringInterpolation: \(result) != \(arrayCount)")
     }
   }
-  a.dealloc(arrayCount)
+  a.deallocateCapacity(arrayCount)
 }
 

benchmark/single-source/PopFrontGeneric.swift

@@ -18,8 +18,8 @@ let arrayCount = 1024
 // This test case exposes rdar://17440222 which caused rdar://17974483 (popFront
 // being really slow).
 
-func _arrayReplace<B: _ArrayBufferType, C: CollectionType
-  where C.Generator.Element == B.Element, B.Index == Int
+func _arrayReplace<B: _ArrayBufferProtocol, C: Collection
+  where C.Iterator.Element == B.Element, B.Index == Int
   >(
   target: inout B, _ subRange: Range<Int>, _ newValues: C
 ) {
@@ -36,7 +36,7 @@ func _arrayReplace<B: _ArrayBufferType, C: CollectionType
   let insertCount = numericCast(newValues.count) as Int
   let growth = insertCount - eraseCount
 
-  if target.requestUniqueMutableBackingBuffer(oldCount + growth) != nil {
+  if target.requestUniqueMutableBackingBuffer(minimumCapacity: oldCount + growth) != nil {
     target.replace(subRange: subRange, with: insertCount, elementsOf: newValues)
   }
   else {
@@ -47,12 +47,12 @@ func _arrayReplace<B: _ArrayBufferType, C: CollectionType
 
 @inline(never)
 public func run_PopFrontArrayGeneric(N: Int) {
-  let orig = Array(count: arrayCount, repeatedValue: 1)
+  let orig = Array(repeating: 1, count: arrayCount)
   var a = [Int]()
   for _ in 1...20*N {
     for _ in 1...reps {
       var result = 0
-      a.appendContentsOf(orig)
+      a.append(contentsOf: orig)
       while a.count != 0 {
         result += a[0]
         _arrayReplace(&a._buffer, 0..<1, EmptyCollection())

benchmark/single-source/Prims.swift

@@ -29,7 +29,7 @@ class PriorityQueue {
   // Create heap for graph with NUM nodes.
   init(Num: Int) {
     heap = Array<EdgeCost>()
-    graphIndexToHeapIndexMap = Array<Int?>(count: Num, repeatedValue:nil)
+    graphIndexToHeapIndexMap = Array<Int?>(repeating:nil, count: Num)
   }
 
   func isEmpty() -> Bool {
@@ -184,7 +184,7 @@ extension Edge : Hashable {
 }
 
 func Prims(graph : Array<GraphNode>, _ fun : (Int,Int)->Double) -> Array<Int?> {
-  var treeEdges = Array<Int?>(count:graph.count, repeatedValue:nil)
+  var treeEdges = Array<Int?>(repeating:nil, count:graph.count)
 
   let queue = PriorityQueue(Num:graph.count)
   // Make the minimum spanning tree root its own parent for simplicity.

benchmark/single-source/RC4.swift

@@ -20,7 +20,7 @@ struct RC4 {
   var J : UInt8 = 0
 
   init() {
-    State = [UInt8](count: 256, repeatedValue: 0)
+    State = [UInt8](repeating: 0, count: 256)
   }
 
   mutating
@@ -84,7 +84,7 @@ public func run_RC4(N: Int) {
   let SecretData : [UInt8] = Array(Secret.utf8)
   let KeyData    : [UInt8] = Array(Key.utf8)
 
-  var LongData : [UInt8] = [UInt8](count: messageLen, repeatedValue: 0)
+  var LongData : [UInt8] = [UInt8](repeating: 0, count: messageLen)
 
   for _ in 1...N {
     // Generate a long message.

benchmark/single-source/RGBHistogram.swift

@@ -20,7 +20,7 @@ import TestsUtils
 
 @inline(never)
 public func run_RGBHistogram(N: Int) {
-    var histogram = [(rrggbb_t, Int)]()
+    var histogram = [(key: rrggbb_t, value: Int)]()
     for _ in 1...100*N {
         histogram = createSortedSparseRGBHistogram(samples)
         if !isCorrectHistogram(histogram) {
@@ -86,23 +86,23 @@ let samples: [rrggbb_t] = [
     0x607F4D9F, 0x9733E55E, 0xA360439D, 0x1DB568FD, 0xB7A5C3A1, 0xBE84492D
 ]
 
-func isCorrectHistogram(histogram: [(rrggbb_t, Int)]) -> Bool {
+func isCorrectHistogram(histogram: [(key: rrggbb_t, value: Int)]) -> Bool {
     return histogram.count  == 157 &&
            histogram[0].0   == 0x00808080 && histogram[0].1   == 54 &&
            histogram[156].0 == 0x003B8D96 && histogram[156].1 == 1
 }
 
 func createSortedSparseRGBHistogram
-        <S: SequenceType where S.Generator.Element == rrggbb_t>
-        (samples: S) -> [(rrggbb_t, Int)] {
+        <S: Sequence where S.Iterator.Element == rrggbb_t>
+        (samples: S) -> [(key: rrggbb_t, value: Int)] {
     var histogram = Dictionary<rrggbb_t, Int>()
 
     for sample in samples {
-        let i = histogram.indexForKey(sample)
+        let i = histogram.index(forKey: sample)
         histogram[sample] = ((i != nil) ? histogram[i!].1 : 0) + 1
     }
 
-    return histogram.sort() {
+    return histogram.sorted() {
       if $0.1 == $1.1 {
         return $0.0 > $1.0
       } else {

benchmark/single-source/RangeAssignment.swift

@@ -15,7 +15,7 @@ import TestsUtils
 @inline(never)
 public func run_RangeAssignment(scale: Int) {
   let range = 100..<200
-  var vector = [Double](count: 5000, repeatedValue: 0.0 )
+  var vector = [Double](repeating: 0.0 , count: 5000)
   let alfa = 1.0
   let N = 500*scale
   for _ in 1...N {

benchmark/single-source/RecursiveOwnedParameter.swift

@@ -24,7 +24,7 @@ class ArrayWrapper {
   var data: [Int]
 
   init(_ count: Int, _ initialValue: Int) {
-    data = [Int](count: count, repeatedValue: initialValue)
+    data = [Int](repeating: initialValue, count: count)
   }
 
   func compare(b: ArrayWrapper, _ iteration: Int, _ stopIteration: Int) -> Bool {

benchmark/single-source/Sim2DArray.swift

@@ -16,7 +16,7 @@ struct Array2D {
   let cols: Int
 
   init(numRows: Int, numCols: Int) {
-    storage = [Int](count: numRows * numCols, repeatedValue: 0)
+    storage = [Int](repeating: 0, count: numRows * numCols)
     rows = numRows
     cols = numCols
   }

benchmark/single-source/SortLettersInPlace.swift

@@ -34,7 +34,7 @@ public func run_SortLettersInPlace(N: Int) {
     ]
 
     // Sort the letters in place.
-    letters.sortInPlace {
+    letters.sort {
       return $0.value < $1.value
     }
 

benchmark/single-source/SortStrings.swift

@@ -1021,7 +1021,7 @@ func benchSortStrings(words: [String]) {
   // Notice that we _copy_ the array of words before we sort it.
   // Pass an explicit '<' predicate to benchmark reabstraction thunks.
   var tempwords = words
-  tempwords.sortInPlace(<)
+  tempwords.sort(isOrderedBefore: <)
 }
 
 public func run_SortStrings(N: Int) {