Merge branch 'master' into macos-parity

Author: e78l

Foundation/NSHTTPCookieStorage.swift

@@ -47,7 +47,7 @@ open class HTTPCookieStorage: NSObject {
         allCookies = [:]
         cookieAcceptPolicy = .always
         super.init()
-        cookieFilePath = filePath(path: _CFXDGCreateConfigHomePath()._swiftObject, fileName: "/.cookies." + cookieStorageName)
+        cookieFilePath = filePath(path: _CFXDGCreateDataHomePath()._swiftObject, fileName: "/.cookies." + cookieStorageName)
         loadPersistedCookies()
     }
 
@@ -65,7 +65,7 @@ open class HTTPCookieStorage: NSObject {
         guard !FileManager.default.fileExists(atPath: path) else { return true }
 
         do {
-            try FileManager.default.createDirectory(atPath: path, withIntermediateDirectories: false, attributes: nil)
+            try FileManager.default.createDirectory(atPath: path, withIntermediateDirectories: true, attributes: nil)
             return true
         } catch {
             return false
@@ -77,7 +77,7 @@ open class HTTPCookieStorage: NSObject {
             return path + fileName
         }
         //if we were unable to create the desired directory, create the cookie file in the `pwd`
-        return fileName
+        return FileManager.default.currentDirectoryPath + fileName
     }
 
     open var cookies: [HTTPCookie]? {

Foundation/Thread.swift

@@ -24,7 +24,7 @@ private func _compiler_crash_fix(_ key: _CFThreadSpecificKey, _ value: AnyObject
 internal class NSThreadSpecific<T: NSObject> {
     private var key = _CFThreadSpecificKeyCreate()
 
-    internal func get(_ generator: (Void) -> T) -> T {
+    internal func get(_ generator: () -> T) -> T {
         if let specific = _CFThreadSpecificGet(key) {
             return specific as! T
         } else {
@@ -130,7 +130,7 @@ open class Thread : NSObject {
         pthread_exit(nil)
     }
 
-    internal var _main: (Void) -> Void = {}
+    internal var _main: () -> Void = {}
 #if os(OSX) || os(iOS) || CYGWIN
     private var _thread: pthread_t? = nil
 #elseif os(Linux) || os(Android)

TestFoundation/TestNSHTTPCookieStorage.swift

@@ -227,10 +227,10 @@ class TestNSHTTPCookieStorage: XCTestCase {
         storage.setCookie(testCookie)
         XCTAssertEqual(storage.cookies!.count, 3)
         var destPath: String
-        if let xdg_config_home = getenv("XDG_CONFIG_HOME") {
-            destPath = String(utf8String: xdg_config_home)! + "/.cookies.shared"
+        if let xdg_data_home = getenv("XDG_DATA_HOME") {
+            destPath = String(utf8String: xdg_data_home)! + "/.cookies.shared"
         } else {
-            destPath = NSHomeDirectory() + "/.config/.cookies.shared"
+            destPath = NSHomeDirectory() + "/.local/share/.cookies.shared"
         }
         let fm = FileManager.default
         var isDir = false

TestFoundation/XDGTestHelper.swift

@@ -43,4 +43,3 @@ class XDGCheck {
         exit(HelperCheckStatus.ok.rawValue)
     }
 }
-