Bladeren bron

Rewrite to using `count()` and `reduce(_:combine:)`

Norio Nomura 10 jaren geleden
bovenliggende
commit
148c41ce98
3 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 1 1
      Base32/Base16.swift
  2. 1 1
      Base32/Base32.swift
  3. 4 4
      SecEncodeTransformTests/SecEncodeTransformTests.swift

+ 1 - 1
Base32/Base16.swift

@@ -77,7 +77,7 @@ extension NSData {
 // MARK: encode
 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("", +)
+    return map(array) { String(format: uppercase ? "%02X" : "%02x", $0) }.reduce("", combine: +)
 }
 
 // MARK: decode

+ 1 - 1
Base32/Base32.swift

@@ -273,7 +273,7 @@ let extendedHexAlphabetDecodeTable: [UInt8] = [
 
 
 private func base32decode(string: String, table: [UInt8]) -> [UInt8]? {
-    let length = countElements(string.unicodeScalars)
+    let length = count(string.unicodeScalars)
     if length == 0 {
         return []
     }

+ 4 - 4
SecEncodeTransformTests/SecEncodeTransformTests.swift

@@ -40,7 +40,7 @@ class SecEncodeTransformTests: XCTestCase {
 
     // MARK: Using SecEncodeTransform
     func test_RFC4648_Encode_UsingSecEncodeTransform() {
-        var results = Array<String>(count: countElements(convertedVectors), repeatedValue: "")
+        var results = Array<String>(count: count(convertedVectors), repeatedValue: "")
         let vectorsAndIndices = Zip2(convertedVectors, indices(results))
         self.measureBlock{
             for _ in 0...100 {
@@ -55,7 +55,7 @@ class SecEncodeTransformTests: XCTestCase {
     }
     
     func test_RFC4648_Decode_UsingSecEncodeTransform() {
-        var results = Array<NSData>(count: countElements(convertedVectors), repeatedValue: NSData())
+        var results = Array<NSData>(count: count(convertedVectors), repeatedValue: NSData())
         let vectorsAndIndices = Zip2(convertedVectors, indices(results))
         self.measureBlock{
             for _ in 0...100 {
@@ -71,7 +71,7 @@ class SecEncodeTransformTests: XCTestCase {
     
     // MARK: Using Base32
     func test_RFC4648_Encode_UsingBase32() {
-        var results = Array<String>(count: countElements(convertedVectors), repeatedValue: "")
+        var results = Array<String>(count: count(convertedVectors), repeatedValue: "")
         let vectorsAndIndices = Zip2(convertedVectors, indices(results))
         self.measureBlock{
             for _ in 0...100 {
@@ -86,7 +86,7 @@ class SecEncodeTransformTests: XCTestCase {
     }
     
     func test_RFC4648_Decode_UsingBase32() {
-        var results = Array<NSData>(count: countElements(convertedVectors), repeatedValue: NSData())
+        var results = Array<NSData>(count: count(convertedVectors), repeatedValue: NSData())
         let vectorsAndIndices = Zip2(convertedVectors, indices(results))
         self.measureBlock{
             for _ in 0...100 {