Merge branch 'refactor'

* refactor:
  Omit some external parameter name
  Use _ for unused member of tuple

Base32/Base16.swift

@@ -29,7 +29,7 @@ import Foundation
 // MARK: - Base16 NSData <-> String
 
 public func base16Encode(data: NSData, uppercase: Bool = true) -> String {
-    return base16encode(data.bytes, data.length, uppercase: uppercase)
+    return base16encode(data.bytes, data.length, uppercase)
 }
 
 public func base16DecodeToData(string: String) -> NSData? {
@@ -43,7 +43,7 @@ public func base16DecodeToData(string: String) -> NSData? {
 // MARK: - Base16 [UInt8] <-> String
 
 public func base16Encode(array: [UInt8], uppercase: Bool = true) -> String {
-    return base16encode(array, array.count, uppercase: uppercase)
+    return base16encode(array, array.count, uppercase)
 }
 
 public func base16Decode(string: String) -> [UInt8]? {
@@ -93,7 +93,7 @@ extension NSData {
 }
 
 // MARK: encode
-private func base16encode(data: UnsafePointer<Void>, length: Int, uppercase: Bool = true) -> String {
+private func base16encode(data: UnsafePointer<Void>, length: Int, _ uppercase: Bool = true) -> String {
     let array = UnsafeBufferPointer<UInt8>(start: UnsafePointer<UInt8>(data), count: length)
     return map(array) { String(format: uppercase ? "%02X" : "%02x", $0) }.reduce("", combine: +)
 }

Base32Tests/Base32Tests.swift

@@ -56,7 +56,7 @@ class Base32Tests: XCTestCase {
         let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (test, expect, expectHex) in convertedVectors {
+                for (test, expect, _) in convertedVectors {
                     let result = base32Encode(test)
                     XCTAssertEqual(result, expect, "base32Encode for \(test)")
                 }
@@ -68,7 +68,7 @@ class Base32Tests: XCTestCase {
         let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (expect, test, testHex) in convertedVectors {
+                for (expect, test, _) in convertedVectors {
                     let result = base32DecodeToData(test)
                     XCTAssertEqual(result!, expect, "base32Decode for \(test)")
                 }
@@ -80,7 +80,7 @@ class Base32Tests: XCTestCase {
         let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (test, expect, expectHex) in convertedVectors {
+                for (test, _, expectHex) in convertedVectors {
                     let resultHex = base32HexEncode(test)
                     XCTAssertEqual(resultHex, expectHex, "base32HexEncode for \(test)")
                 }
@@ -92,7 +92,7 @@ class Base32Tests: XCTestCase {
         let convertedVectors = self.vectors.map {($0.dataUsingUTF8StringEncoding, $1, $2)}
         self.measureBlock{
             for _ in 0...100 {
-                for (expect, test, testHex) in convertedVectors {
+                for (expect, _, testHex) in convertedVectors {
                     let resultHex = base32HexDecodeToData(testHex)
                     XCTAssertEqual(resultHex!, expect, "base32HexDecode for \(testHex)")
                 }

SecEncodeTransformTests/SecEncodeTransformTests.swift

@@ -44,7 +44,7 @@ class SecEncodeTransformTests: XCTestCase {
         let vectorsAndIndices = Zip2(convertedVectors, indices(results))
         self.measureBlock{
             for _ in 0...100 {
-                for ((test, expect, _), index) in vectorsAndIndices {
+                for ((test, _, _), index) in vectorsAndIndices {
                     results[index] = TTTBase32EncodedStringFromData(test)
                 }
             }
@@ -59,7 +59,7 @@ class SecEncodeTransformTests: XCTestCase {
         let vectorsAndIndices = Zip2(convertedVectors, indices(results))
         self.measureBlock{
             for _ in 0...100 {
-                for ((expect, test, _), index) in vectorsAndIndices {
+                for ((_, test, _), index) in vectorsAndIndices {
                     results[index] = TTTDataFromBase32EncodedString(test)
                 }
             }
@@ -75,7 +75,7 @@ class SecEncodeTransformTests: XCTestCase {
         let vectorsAndIndices = Zip2(convertedVectors, indices(results))
         self.measureBlock{
             for _ in 0...100 {
-                for ((test, expect, _), index) in vectorsAndIndices {
+                for ((test, _, _), index) in vectorsAndIndices {
                     results[index] = base32Encode(test)
                 }
             }
@@ -90,7 +90,7 @@ class SecEncodeTransformTests: XCTestCase {
         let vectorsAndIndices = Zip2(convertedVectors, indices(results))
         self.measureBlock{
             for _ in 0...100 {
-                for ((expect, test, _), index) in vectorsAndIndices {
+                for ((_, test, _), index) in vectorsAndIndices {
                     results[index] = base32DecodeToData(test)!
                 }
             }