Merge pull request #2 from ob/master

Update to swift 4

Package.swift

@@ -1,37 +1,48 @@
-// swift-tools-version:3.1
+// swift-tools-version:4.1
 
 import PackageDescription
 
 let package = Package(
   name: "hmap",
+  products: [
+    .executable(name: "hmap", targets: ["hmap"]),
+  ],
+  dependencies: [
+    .package(
+      url: "https://github.com/kylef/Commander.git",
+      from: "0.8.0"
+    ),
+  ],
   targets: [
-    Target(
+    .target(
       name: "hmap",
       dependencies: [
         "HeaderMapCore",
         "HeaderMapFrontend",
+        "Commander",
       ]
     ),
-    Target(
+    .target(
       name: "HeaderMapCore"
     ),
-    Target(
+    .target(
       name: "HeaderMapFrontend",
       dependencies: [
         "HeaderMapCore",
       ]
     ),
-    Target(
-      name: "HeaderMapTesting"
+    .testTarget(
+      name: "HeaderMapTesting",
+      path: "Sources/HeaderMapTesting"
     ),
-    Target(
+    .testTarget(
       name: "HeaderMapCoreTests",
       dependencies: [
         "HeaderMapTesting",
         "HeaderMapCore",
       ]
     ),
-    Target(
+    .testTarget(
       name: "HeaderMapFrontendTests",
       dependencies: [
         "HeaderMapTesting",
@@ -39,11 +50,5 @@ let package = Package(
       ]
     )
   ],
-  dependencies: [
-    .Package(
-      url: "https://github.com/kylef/Commander.git",
-      "0.8.0"
-    ),
-  ],
-  swiftLanguageVersions: [3]
+  swiftLanguageVersions: [4]
 )

Sources/HeaderMapCore/HeaderMap.swift

@@ -52,7 +52,7 @@ public struct HeaderMap {
 
 fileprivate extension BinaryHeaderMap {
   func makeEntries() -> [HeaderMap.Entry] {
-    return (0..<bucketCount).flatMap { (index) in
+    return (0..<bucketCount).compactMap { (index) in
       return getBucket(at: index).flatMap { (bucket) in
         return makeEntry(forBucket: bucket)
       }

Sources/HeaderMapCore/HeaderMapMaker.swift

@@ -196,7 +196,7 @@ fileprivate func numberOfBuckets(forEntryCount entryCount: Int) -> Int {
 
 func sanitize(headerEntries entries: [HeaderMap.Entry]) -> [HeaderMap.Entry] {
   var allKeys = Set<String>()
-  return entries.flatMap { (entry) in
+  return entries.compactMap { (entry) in
     guard !allKeys.contains(entry.key) else { return nil }
     allKeys.insert(entry.key)
     return entry

Sources/HeaderMapFrontend/PrintCommands.swift

@@ -66,7 +66,7 @@ public struct MemoryPrintCommand: ToolCommand {
     let headerMap = try HeaderMap(data: input.headerMap)
     let entries = headerMap.makeEntryList().sorted { return $0.key < $1.key }
     
-    let textLines = entries.flatMap { (entry) -> String? in
+    let textLines = entries.compactMap { (entry) -> String? in
       return "\(entry.key) -> \(entry.prefix)\(entry.suffix)"
     }