Swift 3.2 compatibility

colemancda · colemancda · commit d2a5de60bf67 · 2018-03-08T17:16:24.000-05:00
diff --git a/Sources/TLVCodable.swift b/Sources/TLVCodable.swift
@@ -64,22 +64,22 @@ public extension TLVEncodable where Self: RawRepresentable, Self.RawValue: RawRe
     }
 }
 
-public extension TLVDecodable where Self: RawRepresentable, Self.RawValue: StringProtocol {
+public extension TLVDecodable where Self: RawRepresentable, Self.RawValue == String {
     
     public init?(valueData: Foundation.Data) {
         
-        guard let string = String(data: valueData, encoding: .utf8) as? Self.RawValue
+        guard let string = String(data: valueData, encoding: .utf8)
             else { return nil }
         
         self.init(rawValue: string)
     }
 }
 
-public extension TLVEncodable where Self: RawRepresentable, Self.RawValue: StringProtocol {
+public extension TLVEncodable where Self: RawRepresentable, Self.RawValue == String {
     
     public var valueData: Foundation.Data {
                 
-        guard let data = (self.rawValue as? String)?.data(using: .utf8)
+        guard let data = self.rawValue.data(using: .utf8)
             else { fatalError("Could not encode string") }
         
         return data

Original file line number	Diff line number	Diff line change
`@@ -64,22 +64,22 @@ public extension TLVEncodable where Self: RawRepresentable, Self.RawValue: RawRe`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-public extension TLVDecodable where Self: RawRepresentable, Self.RawValue: StringProtocol {`
	`67`	`+public extension TLVDecodable where Self: RawRepresentable, Self.RawValue == String {`
`68`	`68`
`69`	`69`	`public init?(valueData: Foundation.Data) {`
`70`	`70`
`71`		`- guard let string = String(data: valueData, encoding: .utf8) as? Self.RawValue`
	`71`	`+ guard let string = String(data: valueData, encoding: .utf8)`
`72`	`72`	`else { return nil }`
`73`	`73`
`74`	`74`	`self.init(rawValue: string)`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`-public extension TLVEncodable where Self: RawRepresentable, Self.RawValue: StringProtocol {`
	`78`	`+public extension TLVEncodable where Self: RawRepresentable, Self.RawValue == String {`
`79`	`79`
`80`	`80`	`public var valueData: Foundation.Data {`
`81`	`81`
`82`		`- guard let data = (self.rawValue as? String)?.data(using: .utf8)`
	`82`	`+ guard let data = self.rawValue.data(using: .utf8)`
`83`	`83`	`else { fatalError("Could not encode string") }`
`84`	`84`
`85`	`85`	`return data`