Merge pull request #32 from luckfamousa/swift5.1

Swift5.1

.swift-version

@@ -0,0 +1 @@
+4.2

Package.swift

@@ -1,3 +1,6 @@
+// swift-tools-version: 5.7
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
@@ -20,5 +23,13 @@
 import PackageDescription
 
 let package = Package(
-	name: "Thrift"
+	name: "Thrift",
+    products: [
+        .library(
+            name: "Thrift",
+            targets: ["Thrift"]),
+    ],
+    targets: [
+        .target(name: "Thrift", path: "Sources")
+    ]
 )

Sources/TMap.swift

@@ -21,7 +21,7 @@ public struct TMap<Key : TSerializable & Hashable, Value : TSerializable>: Colle
   public typealias Storage = Dictionary<Key, Value>
   public typealias Element = Storage.Element
   public typealias Index = Storage.Index
-  public typealias IndexDistance = Storage.IndexDistance
+  public typealias IndexDistance = Int
   public typealias Indices = Storage.Indices
   public typealias SubSequence = Storage.SubSequence
   internal var storage = Storage()
@@ -33,11 +33,11 @@ public struct TMap<Key : TSerializable & Hashable, Value : TSerializable>: Colle
   }
 
   public mutating func updateValue(_ value: Value, forKey key: Key) -> Value? {
-    return updateValue(value, forKey: key)
+    return storage.updateValue(value, forKey: key)
   }
 
   public mutating func removeAtIndex(_ index: DictionaryIndex<Key, Value>) -> (Key, Value) {
-    return removeAtIndex(index)
+    return storage.remove(at: index)
   }
 
   public mutating func removeValueForKey(_ key: Key) -> Value? {

Sources/TSSLSocketTransport.swift

@@ -98,18 +98,18 @@ public class TSSLSocketTransport: TStreamTransport {
 
       CFReadStreamSetProperty(readStream?.takeRetainedValue(),
                               .SSLSettings,
-                              settings as CFTypeRef!)
+                              settings as CFTypeRef)
 
       CFWriteStreamSetProperty(writeStream?.takeRetainedValue(),
                               .SSLSettings,
-                              settings as CFTypeRef!)
+                              settings as CFTypeRef)
 
       inputStream = readStream!.takeRetainedValue()
-      inputStream?.schedule(in: .current, forMode: .defaultRunLoopMode)
+      inputStream?.schedule(in: .current, forMode: RunLoop.Mode.default)
       inputStream?.open()
 
       outputStream = writeStream!.takeRetainedValue()
-      outputStream?.schedule(in: .current, forMode: .defaultRunLoopMode)
+      outputStream?.schedule(in: .current, forMode: RunLoop.Mode.default)
       outputStream?.open()
 
       readStream?.release()

Sources/TSet.swift

@@ -19,11 +19,11 @@
 
 import Foundation
 
-public struct TSet<Element : TSerializable & Hashable> : SetAlgebra, Hashable, Collection, ExpressibleByArrayLiteral, TSerializable {
+public struct TSet<Element : TSerializable & Hashable> : Collection, Hashable, SetAlgebra, ExpressibleByArrayLiteral, TSerializable {
+
   /// Typealias for Storage type
   public typealias Storage = Set<Element>
 
-
   /// Internal Storage used for TSet (Set\<Element\>)
   internal var storage : Storage
 
@@ -32,15 +32,15 @@ public struct TSet<Element : TSerializable & Hashable> : SetAlgebra, Hashable, C
 
   public typealias Indices = Storage.Indices
   public typealias Index = Storage.Index
-  public typealias IndexDistance = Storage.IndexDistance
+  public typealias IndexDistance = Int
   public typealias SubSequence = Storage.SubSequence
 
 
   public var indices: Indices { return storage.indices }
 
   // Must implement isEmpty even though both SetAlgebra and Collection provide it due to their conflciting default implementations
   public var isEmpty: Bool { return storage.isEmpty }
-
+    
   public func distance(from start: Index, to end: Index) -> IndexDistance {
     return storage.distance(from: start, to: end)
   }
@@ -67,7 +67,7 @@ public struct TSet<Element : TSerializable & Hashable> : SetAlgebra, Hashable, C
   internal init(storage: Set<Element>) {
     self.storage = storage
   }
-
+    
   public func contains(_ member: Element) -> Bool {
     return storage.contains(member)
   }
@@ -80,28 +80,28 @@ public struct TSet<Element : TSerializable & Hashable> : SetAlgebra, Hashable, C
     return storage.remove(member)
   }
 
-  public func union(_ other: TSet<Element>) -> TSet {
-    return TSet(storage: storage.union(other.storage))
+  public func union(_ other: __owned TSet<Element>) -> TSet<Element> {
+    return TSet<Element>(storage: storage.union(other.storage))
   }
 
   public mutating func formIntersection(_ other: TSet<Element>) {
     return storage.formIntersection(other.storage)
   }
 
-  public mutating func formSymmetricDifference(_ other: TSet<Element>) {
+  public mutating func formSymmetricDifference(_ other: __owned TSet<Element>) {
     return storage.formSymmetricDifference(other.storage)
   }
 
-  public mutating func formUnion(_ other: TSet<Element>) {
+  public mutating func formUnion(_ other: __owned TSet<Element>) {
     return storage.formUnion(other.storage)
   }
 
-  public func intersection(_ other: TSet<Element>) -> TSet {
-    return TSet(storage: storage.intersection(other.storage))
+  public func intersection(_ other: TSet<Element>) -> TSet<Element> {
+    return TSet<Element>(storage: storage.intersection(other.storage))
   }
 
-  public func symmetricDifference(_ other: TSet<Element>) -> TSet {
-    return TSet(storage: storage.symmetricDifference(other.storage))
+  public func symmetricDifference(_ other: __owned TSet<Element>) -> TSet<Element> {
+    return TSet<Element>(storage: storage.symmetricDifference(other.storage))
   }
 
   public mutating func update(with newMember: Element) -> Element? {
@@ -135,6 +135,10 @@ public struct TSet<Element : TSerializable & Hashable> : SetAlgebra, Hashable, C
     return result
   }
 
+  public func hash(into hasher: inout Hasher) {
+      hasher.combine(hashValue)
+  }
+
   /// Mark: TSerializable
   public static var thriftType : TType { return .set }
 
@@ -150,13 +154,13 @@ public struct TSet<Element : TSerializable & Hashable> : SetAlgebra, Hashable, C
     storage = Storage(sequence)
   }
 
-  public static func read(from proto: TProtocol) throws -> TSet {
+  public static func read(from proto: TProtocol) throws -> TSet<Element> {
     let (elementType, size) = try proto.readSetBegin()
     if elementType != Element.thriftType {
       throw TProtocolError(error: .invalidData,
                            extendedError: .unexpectedType(type: elementType))
     }
-    var set = TSet()
+    var set = TSet<Element>()
     for _ in 0..<size {
       let element = try Element.read(from: proto)
       set.storage.insert(element)

Sources/TSocketTransport.swift

@@ -72,7 +72,7 @@ public class TCFSocketTransport: TStreamTransport {
     var readStream:  Unmanaged<CFReadStream>?
     var writeStream:  Unmanaged<CFWriteStream>?
     CFStreamCreatePairWithSocketToHost(kCFAllocatorDefault,
-                                       hostname as CFString!,
+                                       hostname as CFString,
                                        UInt32(port),
                                        &readStream,
                                        &writeStream)
@@ -88,11 +88,11 @@ public class TCFSocketTransport: TStreamTransport {
         }
 
       inputStream = readStream as InputStream
-      inputStream.schedule(in: .current, forMode: .defaultRunLoopMode)
+      inputStream.schedule(in: .current, forMode: RunLoop.Mode.default)
       inputStream.open()
 
       outputStream = writeStream as OutputStream
-      outputStream.schedule(in: .current, forMode: .defaultRunLoopMode)
+      outputStream.schedule(in: .current, forMode: RunLoop.Mode.default)
       outputStream.open()
 
     } else {

Sources/TStreamTransport.swift

@@ -124,7 +124,7 @@ import CoreFoundation
 
         input?.delegate = nil
         input?.close()
-        input?.remove(from: .current, forMode: .defaultRunLoopMode)
+        input?.remove(from: .current, forMode: RunLoop.Mode.default)
         input = nil
       }
 
@@ -135,7 +135,7 @@ import CoreFoundation
         }
         output?.delegate = nil
         output?.close()
-        output?.remove(from: .current, forMode: .defaultRunLoopMode)
+        output?.remove(from: .current, forMode: RunLoop.Mode.default)
         output = nil
       }
     }