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
 }