change FileManager.default() class function to static let

to match Darwin version as of Xcode 8

Author: jpsim

Foundation/NSData.swift

@@ -408,7 +408,7 @@ extension NSData {
         if fd == -1 {
             throw _NSErrorWithErrno(errno, reading: false, path: dirPath)
         }
-        let pathResult = FileManager.default().string(withFileSystemRepresentation:buf, length: Int(strlen(buf)))
+        let pathResult = FileManager.default.string(withFileSystemRepresentation:buf, length: Int(strlen(buf)))
         return (fd, pathResult)
     }
 
@@ -472,7 +472,7 @@ extension NSData {
                 } catch let err {
                     if let auxFilePath = auxFilePath {
                         do {
-                            try FileManager.default().removeItem(atPath: auxFilePath)
+                            try FileManager.default.removeItem(atPath: auxFilePath)
                         } catch _ {}
                     }
                     throw err
@@ -482,7 +482,7 @@ extension NSData {
         if let auxFilePath = auxFilePath {
             if rename(auxFilePath, path) != 0 {
                 do {
-                    try FileManager.default().removeItem(atPath: auxFilePath)
+                    try FileManager.default.removeItem(atPath: auxFilePath)
                 } catch _ {}
                 throw _NSErrorWithErrno(errno, reading: false, path: path)
             }

Foundation/NSFileManager.swift

@@ -70,10 +70,7 @@ open class FileManager: NSObject {
 
     /* Returns the default singleton instance.
     */
-    internal static let defaultInstance = FileManager()
-    open class func `default`() -> FileManager {
-        return defaultInstance
-    }
+    public static let default = FileManager()
 
     /* Returns an NSArray of NSURLs locating the mounted volumes available on the computer. The property keys that can be requested are available in NSURL.
      */
@@ -461,7 +458,7 @@ open class FileManager: NSObject {
             return
         } else if errno == ENOTEMPTY {
 
-            let fsRep = FileManager.default().fileSystemRepresentation(withPath: path)
+            let fsRep = FileManager.default.fileSystemRepresentation(withPath: path)
             let ps = UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>.allocate(capacity: 2)
             ps.initialize(to: UnsafeMutablePointer(mutating: fsRep))
             ps.advanced(by: 1).initialize(to: nil)
@@ -733,7 +730,7 @@ open class FileManager: NSObject {
             return nil
         }
 
-        guard let destination = try? FileManager.default().destinationOfSymbolicLink(atPath: path) else {
+        guard let destination = try? FileManager.default.destinationOfSymbolicLink(atPath: path) else {
             return nil
         }
 
@@ -874,7 +871,7 @@ extension FileManager {
         init?(path: String) {
             let url = URL(fileURLWithPath: path)
             self.baseURL = url
-            guard let ie = FileManager.default().enumerator(at: url, includingPropertiesForKeys: nil, options: [], errorHandler: nil) else {
+            guard let ie = FileManager.default.enumerator(at: url, includingPropertiesForKeys: nil, options: [], errorHandler: nil) else {
                 return nil
             }
             self.innerEnumerator = ie
@@ -906,8 +903,8 @@ extension FileManager {
             _errorHandler = errorHandler
 
             if let path = _url.path {
-                if FileManager.default().fileExists(atPath: path) {
-                    let fsRep = FileManager.default().fileSystemRepresentation(withPath: path)
+                if FileManager.default.fileExists(atPath: path) {
+                    let fsRep = FileManager.default.fileSystemRepresentation(withPath: path)
                     let ps = UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>.allocate(capacity: 2)
                     ps.initialize(to: UnsafeMutablePointer(mutating: fsRep))
                     ps.advanced(by: 1).initialize(to: nil)

Foundation/NSKeyedArchiver.swift

@@ -148,7 +148,7 @@ open class NSKeyedArchiver : NSCoder {
                 if finishedEncoding {
                     try _NSCleanupTemporaryFile(auxFilePath, path)
                 } else {
-                    try FileManager.default().removeItem(atPath: auxFilePath)
+                    try FileManager.default.removeItem(atPath: auxFilePath)
                 }
             } catch _ {
             }

Foundation/NSPathUtilities.swift

@@ -146,7 +146,7 @@ internal extension String {
         }
 
         let temp = _stringByRemovingPrefix(prefix)
-        if FileManager.default().fileExists(atPath: temp) {
+        if FileManager.default.fileExists(atPath: temp) {
             return temp
         }
 
@@ -347,7 +347,7 @@ public extension NSString {
 
             default:
                 resolvedPath = resolvedPath.bridge().stringByAppendingPathComponent(component)
-                if let destination = FileManager.default()._tryToResolveTrailingSymlinkInPath(resolvedPath) {
+                if let destination = FileManager.default._tryToResolveTrailingSymlinkInPath(resolvedPath) {
                     resolvedPath = destination
                 }
             }
@@ -427,7 +427,7 @@ public extension NSString {
         }
 
         var isDirectory = false
-        let exists = FileManager.default().fileExists(atPath: path, isDirectory: &isDirectory)
+        let exists = FileManager.default.fileExists(atPath: path, isDirectory: &isDirectory)
         return exists && isDirectory
     }
 
@@ -436,7 +436,7 @@ public extension NSString {
     internal func _getNamesAtURL(_ filePathURL: URL, prependWith: String, namePredicate: _FileNamePredicate, typePredicate: _FileNamePredicate) -> [String] {
         var result: [String] = []
 
-        if let enumerator = FileManager.default().enumerator(at: filePathURL, includingPropertiesForKeys: nil, options: .skipsSubdirectoryDescendants, errorHandler: nil) {
+        if let enumerator = FileManager.default.enumerator(at: filePathURL, includingPropertiesForKeys: nil, options: .skipsSubdirectoryDescendants, errorHandler: nil) {
             for item in enumerator.lazy.map({ $0 as! URL }) {
                 let itemName = item.lastPathComponent
 
@@ -618,14 +618,14 @@ internal func _NSCreateTemporaryFile(_ filePath: String) throws -> (Int32, Strin
     if fd == -1 {
         throw _NSErrorWithErrno(errno, reading: false, path: filePath)
     }
-    let pathResult = FileManager.default().string(withFileSystemRepresentation: buf, length: Int(strlen(buf)))
+    let pathResult = FileManager.default.string(withFileSystemRepresentation: buf, length: Int(strlen(buf)))
     return (fd, pathResult)
 }
 
 internal func _NSCleanupTemporaryFile(_ auxFilePath: String, _ filePath: String) throws  {
     if rename(auxFilePath, filePath) != 0 {
         do {
-            try FileManager.default().removeItem(atPath: auxFilePath)
+            try FileManager.default.removeItem(atPath: auxFilePath)
         } catch _ {
         }
         throw _NSErrorWithErrno(errno, reading: false, path: filePath)

Foundation/NSURL.swift

@@ -267,7 +267,7 @@ open class NSURL: NSObject, NSSecureCoding, NSCopying {
                 } else {
                     absolutePath = path
                 }
-                let _ = FileManager.default().fileExists(atPath: absolutePath, isDirectory: &isDir)
+                let _ = FileManager.default.fileExists(atPath: absolutePath, isDirectory: &isDir)
             } catch {
                 // ignored
             }
@@ -287,7 +287,7 @@ open class NSURL: NSObject, NSSecureCoding, NSCopying {
         if thePath.hasSuffix("/") {
             isDir = true
         } else {
-            let _ = FileManager.default().fileExists(atPath: path, isDirectory: &isDir)
+            let _ = FileManager.default.fileExists(atPath: path, isDirectory: &isDir)
         }
 
         self.init(fileURLWithPath: thePath, isDirectory: isDir, relativeTo: nil)
@@ -697,7 +697,7 @@ extension NSURL {
             if let urlWithoutDirectory = result,
                let path = urlWithoutDirectory.path {
                 var isDir : Bool = false
-                if FileManager.default().fileExists(atPath: path, isDirectory: &isDir) && isDir {
+                if FileManager.default.fileExists(atPath: path, isDirectory: &isDir) && isDir {
                     result = self.appendingPathComponent(pathComponent, isDirectory: true)
                 }
             }
@@ -747,7 +747,7 @@ extension NSURL {
         if selfPath.hasPrefix("/") {
             absolutePath = selfPath
         } else {
-            let workingDir = FileManager.default().currentDirectoryPath
+            let workingDir = FileManager.default.currentDirectoryPath
             absolutePath = workingDir.bridge().stringByAppendingPathComponent(selfPath)
         }
 
@@ -769,15 +769,15 @@ extension NSURL {
 
             default:
                 resolvedPath = resolvedPath.bridge().stringByAppendingPathComponent(component)
-                if let destination = FileManager.default()._tryToResolveTrailingSymlinkInPath(resolvedPath) {
+                if let destination = FileManager.default._tryToResolveTrailingSymlinkInPath(resolvedPath) {
                     resolvedPath = destination
                 }
             }
         }
 
         // It might be a responsibility of NSURL(fileURLWithPath:). Check it.
         var isExistingDirectory = false
-        let _ = FileManager.default().fileExists(atPath: resolvedPath, isDirectory: &isExistingDirectory)
+        let _ = FileManager.default.fileExists(atPath: resolvedPath, isDirectory: &isExistingDirectory)
 
         if excludeSystemDirs {
             resolvedPath = resolvedPath._tryToRemovePathPrefix("/private") ?? resolvedPath

TestFoundation/TestNSBundle.swift

@@ -68,7 +68,7 @@ class TestNSBundle : XCTestCase {
         let testPlist = bundle.urlForResource("Test", withExtension: "plist")
         XCTAssertNotNil(testPlist)
         XCTAssertEqual("Test.plist", testPlist!.lastPathComponent)
-        XCTAssert(FileManager.default().fileExists(atPath: testPlist!.path!))
+        XCTAssert(FileManager.default.fileExists(atPath: testPlist!.path!))
 
         // aliases, paths
         XCTAssertEqual(testPlist!.path, bundle.urlForResource("Test", withExtension: "plist", subdirectory: nil)!.path)
@@ -111,20 +111,20 @@ class TestNSBundle : XCTestCase {
         let tempDir = "/tmp/TestFoundation_Playground_" + NSUUID().uuidString + "/"
 
         do {
-            try FileManager.default().createDirectory(atPath: tempDir, withIntermediateDirectories: false, attributes: nil)
+            try FileManager.default.createDirectory(atPath: tempDir, withIntermediateDirectories: false, attributes: nil)
 
             // Make a flat bundle in the playground
             let bundlePath = tempDir + _bundleName
-            try FileManager.default().createDirectory(atPath: bundlePath, withIntermediateDirectories: false, attributes: nil)
+            try FileManager.default.createDirectory(atPath: bundlePath, withIntermediateDirectories: false, attributes: nil)
 
             // Put some resources in the bundle
             for n in _bundleResourceNames {
-                let _ = FileManager.default().createFile(atPath: bundlePath + "/" + n, contents: nil, attributes: nil)
+                let _ = FileManager.default.createFile(atPath: bundlePath + "/" + n, contents: nil, attributes: nil)
             }
             // Add a resource into a subdirectory
             let subDirPath = bundlePath + "/" + _subDirectory
-            try FileManager.default().createDirectory(atPath: subDirPath, withIntermediateDirectories: false, attributes: nil)
-            let _ = FileManager.default().createFile(atPath: subDirPath + "/" + _main + "." + _type, contents: nil, attributes: nil)
+            try FileManager.default.createDirectory(atPath: subDirPath, withIntermediateDirectories: false, attributes: nil)
+            let _ = FileManager.default.createFile(atPath: subDirPath + "/" + _main + "." + _type, contents: nil, attributes: nil)
         } catch _ {
             return nil
         }
@@ -135,7 +135,7 @@ class TestNSBundle : XCTestCase {
 
     private func _cleanupPlayground(_ location: String) {
         do {
-            try FileManager.default().removeItem(atPath: location)
+            try FileManager.default.removeItem(atPath: location)
         } catch _ {
             // Oh well
         }

TestFoundation/TestNSData.swift

@@ -49,7 +49,7 @@ class TestNSData: XCTestCase {
         let savePath = URL(fileURLWithPath: "/var/tmp/Test.plist")
         do {
             try saveData.write(to: savePath, options: .dataWritingAtomic)
-            let fileManager = FileManager.default()
+            let fileManager = FileManager.default
             XCTAssertTrue(fileManager.fileExists(atPath: savePath.path!))
             try! fileManager.removeItem(atPath: savePath.path!)
         } catch _ {

TestFoundation/TestNSFileManager.swift

@@ -37,7 +37,7 @@ class TestNSFileManager : XCTestCase {
     }
 
     func test_createDirectory() {
-        let fm = FileManager.default()
+        let fm = FileManager.default
         let path = "/tmp/testdir\(NSUUID().uuidString)"
 
         ignoreError { try fm.removeItem(atPath: path) }
@@ -62,7 +62,7 @@ class TestNSFileManager : XCTestCase {
     }
 
     func test_createFile() {
-        let fm = FileManager.default()
+        let fm = FileManager.default
         let path = "/tmp/testfile\(NSUUID().uuidString)"
 
         ignoreError { try fm.removeItem(atPath: path) }
@@ -82,7 +82,7 @@ class TestNSFileManager : XCTestCase {
     }
 
     func test_moveFile() {
-        let fm = FileManager.default()
+        let fm = FileManager.default
         let path = "/tmp/testfile\(NSUUID().uuidString)"
         let path2 = "/tmp/testfile2\(NSUUID().uuidString)"
 
@@ -105,15 +105,15 @@ class TestNSFileManager : XCTestCase {
 
     func test_fileSystemRepresentation() {
         let str = "☃"
-        let result = FileManager.default().fileSystemRepresentation(withPath: str)
+        let result = FileManager.default.fileSystemRepresentation(withPath: str)
         XCTAssertNotNil(result)
         XCTAssertEqual(UInt8(bitPattern: result[0]), 0xE2)
         XCTAssertEqual(UInt8(bitPattern: result[1]), 0x98)
         XCTAssertEqual(UInt8(bitPattern: result[2]), 0x83)
     }
 
     func test_fileAttributes() {
-        let fm = FileManager.default()
+        let fm = FileManager.default
         let path = "/tmp/test_fileAttributes\(NSUUID().uuidString)"
 
         ignoreError { try fm.removeItem(atPath: path) }
@@ -162,7 +162,7 @@ class TestNSFileManager : XCTestCase {
 
     func test_setFileAttributes() {
         let path = "/tmp/test_setFileAttributes\(NSUUID().uuidString)"
-        let fm = FileManager.default()
+        let fm = FileManager.default
 
         ignoreError { try fm.removeItem(atPath: path) }
         XCTAssertTrue(fm.createFile(atPath: path, contents: Data(), attributes: nil))
@@ -187,7 +187,7 @@ class TestNSFileManager : XCTestCase {
     }
 
     func test_pathEnumerator() {
-        let fm = FileManager.default()
+        let fm = FileManager.default
         let testDirName = "testdir\(NSUUID().uuidString)"
         let basePath = "/tmp/\(testDirName)"
         let itemPath = "/tmp/\(testDirName)/item"
@@ -207,7 +207,7 @@ class TestNSFileManager : XCTestCase {
             XCTFail()
         }
 
-        if let e = FileManager.default().enumerator(atPath: basePath) {
+        if let e = FileManager.default.enumerator(atPath: basePath) {
             let foundItems = NSMutableSet()
             while let item = e.nextObject() as? NSString {
                 foundItems.add(item)
@@ -220,7 +220,7 @@ class TestNSFileManager : XCTestCase {
     }
 
     func test_directoryEnumerator() {
-        let fm = FileManager.default()
+        let fm = FileManager.default
         let testDirName = "testdir\(NSUUID().uuidString)"
         let path = "/tmp/\(testDirName)"
         let itemPath = "/tmp/\(testDirName)/item"
@@ -234,7 +234,7 @@ class TestNSFileManager : XCTestCase {
             XCTFail()
         }
 
-        if let e = FileManager.default().enumerator(at: URL(fileURLWithPath: path), includingPropertiesForKeys: nil, options: [], errorHandler: nil) {
+        if let e = FileManager.default.enumerator(at: URL(fileURLWithPath: path), includingPropertiesForKeys: nil, options: [], errorHandler: nil) {
             var foundItems = [String:Int]()
             while let item = e.nextObject() as? NSURL {
                 if let p = item.path {
@@ -255,7 +255,7 @@ class TestNSFileManager : XCTestCase {
             XCTFail()
         }
 
-        if let e = FileManager.default().enumerator(at: URL(fileURLWithPath: path), includingPropertiesForKeys: nil, options: [], errorHandler: nil) {
+        if let e = FileManager.default.enumerator(at: URL(fileURLWithPath: path), includingPropertiesForKeys: nil, options: [], errorHandler: nil) {
             var foundItems = [String:Int]()
             while let item = e.nextObject() as? NSURL {
                 if let p = item.path {
@@ -269,7 +269,7 @@ class TestNSFileManager : XCTestCase {
             XCTFail()
         }
 
-        if let e = FileManager.default().enumerator(at: URL(fileURLWithPath: path), includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants], errorHandler: nil) {
+        if let e = FileManager.default.enumerator(at: URL(fileURLWithPath: path), includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants], errorHandler: nil) {
             var foundItems = [String:Int]()
             while let item = e.nextObject() as? NSURL {
                 if let p = item.path {
@@ -282,7 +282,7 @@ class TestNSFileManager : XCTestCase {
             XCTFail()
         }
 
-        if let e = FileManager.default().enumerator(at: URL(fileURLWithPath: path), includingPropertiesForKeys: nil, options: [], errorHandler: nil) {
+        if let e = FileManager.default.enumerator(at: URL(fileURLWithPath: path), includingPropertiesForKeys: nil, options: [], errorHandler: nil) {
             var foundItems = [String:Int]()
             while let item = e.nextObject() as? NSURL {
                 if let p = item.path {
@@ -300,15 +300,15 @@ class TestNSFileManager : XCTestCase {
             didGetError = true
             return true
         }
-        if let e = FileManager.default().enumerator(at: URL(fileURLWithPath: "/nonexistant-path"), includingPropertiesForKeys: nil, options: [], errorHandler: handler) {
+        if let e = FileManager.default.enumerator(at: URL(fileURLWithPath: "/nonexistant-path"), includingPropertiesForKeys: nil, options: [], errorHandler: handler) {
             XCTAssertNil(e.nextObject())
         } else {
             XCTFail()
         }
         XCTAssertTrue(didGetError)
 
         do {
-            let contents = try FileManager.default().contentsOfDirectory(at: URL(fileURLWithPath: path), includingPropertiesForKeys: nil, options: []).map {
+            let contents = try FileManager.default.contentsOfDirectory(at: URL(fileURLWithPath: path), includingPropertiesForKeys: nil, options: []).map {
                 return $0.path!
             }
             XCTAssertEqual(contents.count, 2)
@@ -326,7 +326,7 @@ class TestNSFileManager : XCTestCase {
     }
 
     func test_contentsOfDirectoryAtPath() {
-        let fm = FileManager.default()
+        let fm = FileManager.default
         let testDirName = "testdir\(NSUUID().uuidString)"
         let path = "/tmp/\(testDirName)"
         let itemPath1 = "/tmp/\(testDirName)/item"
@@ -370,7 +370,7 @@ class TestNSFileManager : XCTestCase {
     }
 
     func test_subpathsOfDirectoryAtPath() {
-        let fm = FileManager.default()
+        let fm = FileManager.default
         let path = "/tmp/testdir"
         let path2 = "/tmp/testdir/sub"
         let itemPath1 = "/tmp/testdir/item"