Merge pull request #5 from apple/update

Sync with SwiftPM trunk

Author: aciidgh

.gitignore

@@ -3,3 +3,4 @@
 /Packages
 /*.xcodeproj
 xcuserdata/
+.swiftpm

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.1
 
 /*
  This source file is part of the Swift.org open source project

Sources/TSCBasic/DictionaryLiteralExtensions.swift

@@ -11,7 +11,7 @@
 // Can't conform a protocol explicitly with certain where clause for now but it'd be resolved by SE-0143.
 // ref: https://github.com/apple/swift-evolution/blob/master/proposals/0143-conditional-conformances.md
 // MARK: CustomStringConvertible
-extension DictionaryLiteral where Key: CustomStringConvertible, Value: CustomStringConvertible {
+extension KeyValuePairs where Key: CustomStringConvertible, Value: CustomStringConvertible {
     /// A string that represents the contents of the dictionary literal.
     public var description: String {
         let lastCount = self.count - 1
@@ -25,8 +25,8 @@ extension DictionaryLiteral where Key: CustomStringConvertible, Value: CustomStr
 }
 
 // MARK: Equatable
-extension DictionaryLiteral where Key: Equatable, Value: Equatable {
-    public static func ==(lhs: DictionaryLiteral<Key,Value>, rhs: DictionaryLiteral<Key,Value>) -> Bool {
+extension KeyValuePairs where Key: Equatable, Value: Equatable {
+    public static func ==(lhs: KeyValuePairs<Key,Value>, rhs: KeyValuePairs<Key,Value>) -> Bool {
         if lhs.count != rhs.count {
             return false
         }

Sources/TSCBasic/FileSystem.swift

@@ -665,7 +665,7 @@ public class InMemoryFileSystem: FileSystem {
         // Ignore root and get the parent node's content if its a directory.
         guard !path.isRoot,
               let parent = try? getNode(path.parentDirectory),
-              case .directory(let contents)? = parent?.contents else {
+            case .directory(let contents) = parent.contents else {
             return
         }
         // Set it to nil to release the contents.

Sources/TSCBasic/GraphAlgorithms.swift

@@ -121,7 +121,7 @@ public func findCycle<T: Hashable>(
     func visit(_ node: T, _ successors: (T) throws -> [T]) rethrows -> (path: [T], cycle: [T])? {
         // If this node is already in the current path then we have found a cycle.
         if !path.append(node) {
-            let index = path.index(of: node)!
+            let index = path.firstIndex(of: node)!
             return (Array(path[path.startIndex..<index]), Array(path[index..<path.endIndex]))
         }
 

Sources/TSCBasic/JSON.swift

@@ -45,7 +45,7 @@ public enum JSON {
     case dictionary([String: JSON])
 
     /// An ordered dictionary.
-    case orderedDictionary(DictionaryLiteral<String, JSON>)
+    case orderedDictionary(KeyValuePairs<String, JSON>)
 }
 
 /// A JSON representation of an element.
@@ -262,7 +262,7 @@ extension JSON {
 
     /// Load a JSON item from a byte string.
     public init(bytes: ByteString) throws {
-        try self.init(data: Data(bytes: bytes.contents))
+        try self.init(data: Data(bytes.contents))
     }
 
     /// Convenience initalizer for UTF8 encoded strings.

Sources/TSCBasic/JSONMapper.swift

@@ -41,7 +41,10 @@ extension JSON {
 
     /// Returns an optional JSON mappable object from a given key.
     public func get<T: JSONMappable>(_ key: String) -> T? {
-        return try? get(key)
+        if let object: JSON = try? get(key) {
+            return try? T.init(json: object)
+        }
+        return nil
     }
 
     /// Returns a JSON mappable array from a given key.

Sources/TSCBasic/OrderedDictionary.swift

@@ -75,7 +75,7 @@ public struct OrderedDictionary<Key: Hashable, Value> {
             return nil
         }
         dict[key] = nil
-        array.remove(at: array.index(of: key)!)
+        array.remove(at: array.firstIndex(of: key)!)
         return value
     }
 

Sources/TSCBasic/OrderedSet.swift

@@ -98,7 +98,7 @@ public struct OrderedSet<E: Hashable>: Equatable, Collection {
         let _removedElement = set.remove(element)
         guard let removedElement = _removedElement else { return nil }
 
-        let idx = array.index(of: element)!
+        let idx = array.firstIndex(of: element)!
         array.remove(at: idx)
 
         return removedElement

Sources/TSCBasic/StringConversions.swift

@@ -45,12 +45,12 @@ extension String {
     public func spm_shellEscaped() -> String {
 
         // If all the characters in the string are in whitelist then no need to escape.
-        guard let pos = utf8.index(where: { !inShellWhitelist($0) }) else {
+        guard let pos = utf8.firstIndex(where: { !inShellWhitelist($0) }) else {
             return self
         }
 
         // If there are no single quotes then we can just wrap the string around single quotes.
-        guard let singleQuotePos = utf8[pos...].index(of: UInt8(ascii: "'")) else {
+        guard let singleQuotePos = utf8[pos...].firstIndex(of: UInt8(ascii: "'")) else {
             return "'" + self + "'"
         }