Add and use specialized (for UInt16/32/64) versions of Data.to<T>(type:) extension function

Author: tsolomko

Sources/ByteReader.swift

@@ -142,7 +142,7 @@ public class ByteReader {
             return { (data: Data, offset: inout Int) -> UInt64 in
                 precondition(data.endIndex - offset >= 8)
                 defer { offset += 8 }
-                return data[offset..<offset + 8].to(type: UInt64.self)
+                return data[offset..<offset + 8].toU64()
             } (self.data, &self.offset)
         #else
             precondition(bytesLeft >= 8)
@@ -193,7 +193,7 @@ public class ByteReader {
             return { (data: Data, offset: inout Int) -> UInt32 in
                 precondition(data.endIndex - offset >= 4)
                 defer { offset += 4 }
-                return data[offset..<offset + 4].to(type: UInt32.self)
+                return data[offset..<offset + 4].toU32()
             } (self.data, &self.offset)
         #else
             precondition(bytesLeft >= 4)
@@ -244,7 +244,7 @@ public class ByteReader {
             return { (data: Data, offset: inout Int) -> UInt16 in
                 precondition(data.endIndex - offset >= 2)
                 defer { offset += 2 }
-                return data[offset..<offset + 2].to(type: UInt16.self)
+                return data[offset..<offset + 2].toU16()
             } (self.data, &self.offset)
         #else
             precondition(bytesLeft >= 2)

Sources/Extensions.swift

@@ -8,8 +8,18 @@ import Foundation
 extension Data {
 
     @inline(__always)
-    func to<T>(type: T.Type) -> T {
-        return self.withUnsafeBytes { $0.bindMemory(to: type)[0] }
+    func toU16() -> UInt16 {
+        return self.withUnsafeBytes { $0.bindMemory(to: UInt16.self)[0] }
+    }
+
+    @inline(__always)
+    func toU32() -> UInt32 {
+        return self.withUnsafeBytes { $0.bindMemory(to: UInt32.self)[0] }
+    }
+
+    @inline(__always)
+    func toU64() -> UInt64 {
+        return self.withUnsafeBytes { $0.bindMemory(to: UInt64.self)[0] }
     }
 
     @inline(__always)

Sources/LsbBitReader.swift

@@ -356,7 +356,7 @@ public final class LsbBitReader: ByteReader, BitReader {
                 precondition(bitMask == 1, "BitReader is not aligned.")
                 precondition(data.endIndex - offset >= 8)
                 defer { offset += 8 }
-                return data[offset..<offset + 8].to(type: UInt64.self)
+                return data[offset..<offset + 8].toU64()
             } (self.data, &self.offset, self.bitMask)
         #else
             precondition(bitMask == 1, "BitReader is not aligned.")
@@ -410,7 +410,7 @@ public final class LsbBitReader: ByteReader, BitReader {
                 precondition(bitMask == 1, "BitReader is not aligned.")
                 precondition(data.endIndex - offset >= 4)
                 defer { offset += 4 }
-                return data[offset..<offset + 4].to(type: UInt32.self)
+                return data[offset..<offset + 4].toU32()
             } (self.data, &self.offset, self.bitMask)
         #else
             precondition(bitMask == 1, "BitReader is not aligned.")
@@ -464,7 +464,7 @@ public final class LsbBitReader: ByteReader, BitReader {
                 precondition(bitMask == 1, "BitReader is not aligned.")
                 precondition(data.endIndex - offset >= 2)
                 defer { offset += 2 }
-                return data[offset..<offset + 2].to(type: UInt16.self)
+                return data[offset..<offset + 2].toU16()
             } (self.data, &self.offset, self.bitMask)
         #else
             precondition(bitMask == 1, "BitReader is not aligned.")

Sources/MsbBitReader.swift

@@ -356,7 +356,7 @@ public final class MsbBitReader: ByteReader, BitReader {
                 precondition(bitMask == 128, "BitReader is not aligned.")
                 precondition(data.endIndex - offset >= 8)
                 defer { offset += 8 }
-                return data[offset..<offset + 8].to(type: UInt64.self)
+                return data[offset..<offset + 8].toU64()
             } (self.data, &self.offset, self.bitMask)
         #else
             precondition(bitMask == 128, "BitReader is not aligned.")
@@ -410,7 +410,7 @@ public final class MsbBitReader: ByteReader, BitReader {
                 precondition(bitMask == 128, "BitReader is not aligned.")
                 precondition(data.endIndex - offset >= 4)
                 defer { offset += 4 }
-                return data[offset..<offset + 4].to(type: UInt32.self)
+                return data[offset..<offset + 4].toU32()
             } (self.data, &self.offset, self.bitMask)
         #else
             precondition(bitMask == 128, "BitReader is not aligned.")
@@ -464,7 +464,7 @@ public final class MsbBitReader: ByteReader, BitReader {
                 precondition(bitMask == 128, "BitReader is not aligned.")
                 precondition(data.endIndex - offset >= 2)
                 defer { offset += 2 }
-                return data[offset..<offset + 2].to(type: UInt16.self)
+                return data[offset..<offset + 2].toU16()
             } (self.data, &self.offset, self.bitMask)
         #else
             precondition(bitMask == 128, "BitReader is not aligned.")