Cleanup some unused types in Utilities and use a Mutex instead of NSLock

Author: parkera

Sources/CoreFoundation/include/ForSwiftFoundationOnly.h

@@ -59,6 +59,8 @@
 
 #if TARGET_OS_LINUX
 #include <sys/sysmacros.h>
+#include <fcntl.h>
+#include <sys/stat.h>
 #endif
 
 #if TARGET_OS_ANDROID

Tests/Foundation/TestProcess.swift

@@ -580,25 +580,23 @@ class TestProcess : XCTestCase {
         task.executableURL = url
         task.arguments = []
         let stdoutPipe = Pipe()
-        let dataLock = NSLock()
+        let stdoutData = Mutex(Data())
         task.standardOutput = stdoutPipe
 
-        // protected by the task.waitUntilExit()
-        nonisolated(unsafe) var stdoutData = Data()
         stdoutPipe.fileHandleForReading.readabilityHandler = { fh in
-            dataLock.synchronized {
-                stdoutData.append(fh.availableData)
+            stdoutData.withLock {
+                $0.append(fh.availableData)
             }
         }
         try task.run()
         task.waitUntilExit()
         stdoutPipe.fileHandleForReading.readabilityHandler = nil
 
-        try dataLock.synchronized {
+        try stdoutData.withLock {
             if let d = try stdoutPipe.fileHandleForReading.readToEnd() {
-                stdoutData.append(d)
+                $0.append(d)
             }
-            XCTAssertEqual(String(data: stdoutData, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines), "No files specified.")
+            XCTAssertEqual(String(data: $0, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines), "No files specified.")
         }
     }
 

Tests/Foundation/TestURLSessionFTP.swift

@@ -9,6 +9,8 @@
 
 #if !os(Windows)
 
+import Synchronization
+
 class TestURLSessionFTP : LoopbackFTPServerTest {
     let saveString = """
                      FTP implementation to test FTP
@@ -65,11 +67,10 @@ class FTPDataTask : NSObject, @unchecked Sendable {
     var responseReceivedExpectation: XCTestExpectation?
     var hasTransferCompleted = false
 
-    private var errorLock = NSLock()
-    private var _error = false
+    private let _error = Mutex(false)
     public var error: Bool {
-        get { errorLock.synchronized { _error } }
-        set { errorLock.synchronized { _error = newValue } }
+        get { _error.withLock { $0 } }
+        set { _error.withLock { $0 = newValue } }
     }
 
     init(with expectation: XCTestExpectation) {

Tests/Foundation/Utilities.swift

@@ -640,35 +640,6 @@ extension String {
     }
 }
 
-extension FileHandle: @retroactive TextOutputStream {
-    public func write(_ string: String) {
-        write(Data(string.utf8))
-    }
-    
-    struct EncodedOutputStream: TextOutputStream {
-        let fileHandle: FileHandle
-        let encoding: String.Encoding
-        
-        init(_ fileHandle: FileHandle, encoding: String.Encoding) {
-            self.fileHandle = fileHandle
-            self.encoding = encoding
-        }
-        
-        func write(_ string: String) {
-            fileHandle.write(string.data(using: encoding)!)
-        }
-    }
-}
-
-extension NSLock {
-    public func synchronized<T>(_ closure: () throws -> T) rethrows -> T {
-        self.lock()
-        defer { self.unlock() }
-        return try closure()
-    }
-}
-
-
 // Create a uniquely named temporary directory, pass the URL and path to a closure then remove the directory afterwards.
 public func withTemporaryDirectory<R>(functionName: String = #function, block: (URL, String) throws -> R) throws -> R {