THRIFT-4902: Swift 4 and 5 compatibility (#1827)
diff --git a/lib/swift/Sources/TCompactProtocol.swift b/lib/swift/Sources/TCompactProtocol.swift
index 59773c3..5b302d3 100644
--- a/lib/swift/Sources/TCompactProtocol.swift
+++ b/lib/swift/Sources/TCompactProtocol.swift
@@ -67,7 +67,7 @@
/// Mark: - TCompactProtocol helpers
func writebyteDirect(_ byte: UInt8) throws {
- let byte = Data(bytes: [byte])
+ let byte = Data([byte])
try ProtocolTransportTry(error: TProtocolError(message: "Transport Write Failed")) {
try self.transport.write(data: byte)
}
@@ -90,7 +90,7 @@
}
try ProtocolTransportTry(error: TProtocolError(message: "Transport Write Failed")) {
- try self.transport.write(data: Data(bytes: i32buf[0..<idx]))
+ try self.transport.write(data: Data(i32buf[0..<idx]))
}
}
@@ -111,9 +111,8 @@
}
try ProtocolTransportTry(error: TProtocolError(message: "Transport Write Failed")) {
- try self.transport.write(data: Data(bytes: varint64out[0..<idx]))
+ try self.transport.write(data: Data(varint64out[0..<idx]))
}
-
}
func writeCollectionBegin(_ elementType: TType, size: Int32) throws {
@@ -249,7 +248,6 @@
let got = String(format:"%2X", protocolId)
throw TProtocolError(message: "Wrong Protocol ID \(got)",
extendedError: .mismatchedProtocol(expected: expected, got: got))
-
}
let versionAndType: UInt8 = try read()
@@ -257,7 +255,6 @@
if version != TCompactProtocol.version {
throw TProtocolError(error: .badVersion(expected: "\(TCompactProtocol.version)",
got:"\(version)"))
-
}
let type = (versionAndType >> UInt8(TCType.typeShiftAmount)) & TCType.typeBits
@@ -485,7 +482,6 @@
}
lastFieldId = UInt8(fieldID)
-
}
public func writeFieldStop() throws {