Changed signature of createTemporaryDirectorry method. improved a way to create utf8 strings

Formatting fixes

Author: Overcot

Sources/Basics/TemporaryFile.swift

@@ -33,12 +33,14 @@ import TSCLibc
 /// - Throws: `MakeDirectoryError` and rethrows all errors from `body`.
 @available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
 public func withTemporaryDirectory<Result>(
-  dir: AbsolutePath? = nil, prefix: String = "TemporaryDirectory" , _ body: (AbsolutePath, @escaping (AbsolutePath) -> Void) async throws -> Result
+    dir: AbsolutePath? = nil,
+    prefix: String = "TemporaryDirectory",
+    _ body: (AbsolutePath, @escaping (AbsolutePath) -> Void) async throws -> Result
 ) async throws -> Result {
-    let template = try createTemporaryDirectoryTemplate(dir: dir, prefix: prefix)
-  return try await body(AbsolutePath(String(cString: template))) { path in
-    _ = try? FileManager.default.removeItem(atPath: path.pathString)
-  }
+    let temporaryDirectory = try createTemporaryDirectory(dir: dir, prefix: prefix)
+    return try await body(temporaryDirectory) { path in
+        _ = try? FileManager.default.removeItem(atPath: path.pathString)
+    }
 }
 
 /// Creates a temporary directory and evaluates a closure with the directory path as an argument.
@@ -59,27 +61,30 @@ public func withTemporaryDirectory<Result>(
 /// - Throws: `MakeDirectoryError` and rethrows all errors from `body`.
 @available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
 public func withTemporaryDirectory<Result>(
-  dir: AbsolutePath? = nil, prefix: String = "TemporaryDirectory", removeTreeOnDeinit: Bool = false , _ body: (AbsolutePath) async throws -> Result
+    dir: AbsolutePath? = nil,
+    prefix: String = "TemporaryDirectory",
+    removeTreeOnDeinit: Bool = false ,
+    _ body: (AbsolutePath) async throws -> Result
 ) async throws -> Result {
-  try await withTemporaryDirectory(dir: dir, prefix: prefix) { path, cleanup in
-    defer { if removeTreeOnDeinit { cleanup(path) } }
-    return try await body(path)
-  }
+    try await withTemporaryDirectory(dir: dir, prefix: prefix) { path, cleanup in
+        defer { if removeTreeOnDeinit { cleanup(path) } }
+        return try await body(path)
+    }
 }
 
-private func createTemporaryDirectoryTemplate(dir: AbsolutePath?, prefix: String) throws -> [Int8] {
+private func createTemporaryDirectory(dir: AbsolutePath?, prefix: String) throws -> AbsolutePath {
     // Construct path to the temporary directory.
     let templatePath = try AbsolutePath(prefix + ".XXXXXX", relativeTo: determineTempDirectory(dir))
-
+    
     // Convert templatePath to a C style string terminating with null char to be an valid input
     // to mkdtemp method. The XXXXXX in this string will be replaced by a random string
     // which will be the actual path to the temporary directory.
-    var template = [UInt8](templatePath.pathString.utf8).map({ Int8($0) }) + [Int8(0)]
-
+    var template = templatePath.pathString.utf8CString.map { $0 }
+    
     if TSCLibc.mkdtemp(&template) == nil {
         throw MakeDirectoryError(errno: errno)
     }
-    return template
+    return AbsolutePath(String(cString: template))
 }
 
 private extension MakeDirectoryError {

Tests/BasicsTests/TemporaryFileTests.swift

@@ -1,12 +1,12 @@
 /*
  This source file is part of the Swift.org open source project
-
+ 
  Copyright (c) 2022 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
-
+ 
  See http://swift.org/LICENSE.txt for license information
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
-*/
+ */
 
 import XCTest
 
@@ -31,7 +31,7 @@ class TemporaryAsyncFileTests: XCTestCase {
             return tempDirPath
         }
         XCTAssertFalse(localFileSystem.isDirectory(path1))
-
+        
         // Test temp directory is not removed when its not empty.
         let path2: AbsolutePath = try await withTemporaryDirectory { tempDirPath in
             XCTAssertTrue(localFileSystem.isDirectory(tempDirPath))
@@ -42,15 +42,15 @@ class TemporaryAsyncFileTests: XCTestCase {
                 return
             }
             await task.value
-
+            
             try localFileSystem.writeFileContents(filePath, bytes: ByteString())
             return tempDirPath
         }
         XCTAssertTrue(localFileSystem.isDirectory(path2))
         // Cleanup.
         try FileManager.default.removeItem(atPath: path2.pathString)
         XCTAssertFalse(localFileSystem.isDirectory(path2))
-
+        
         // Test temp directory is removed when its not empty and removeTreeOnDeinit is enabled.
         let path3: AbsolutePath = try await withTemporaryDirectory(removeTreeOnDeinit: true) { tempDirPath in
             XCTAssertTrue(localFileSystem.isDirectory(tempDirPath))
@@ -60,13 +60,13 @@ class TemporaryAsyncFileTests: XCTestCase {
                 return
             }
             await task.value
-
+            
             try localFileSystem.writeFileContents(filePath, bytes: ByteString())
             return tempDirPath
         }
         XCTAssertFalse(localFileSystem.isDirectory(path3))
     }
-
+    
     func testCanCreateUniqueTempDirectories() async throws {
         let (pathOne, pathTwo): (AbsolutePath, AbsolutePath) = try await withTemporaryDirectory(removeTreeOnDeinit: true) { pathOne in
             let pathTwo: AbsolutePath = try await withTemporaryDirectory(removeTreeOnDeinit: true) { pathTwo in
@@ -75,7 +75,7 @@ class TemporaryAsyncFileTests: XCTestCase {
                     return
                 }
                 await task.value
-
+                
                 XCTAssertTrue(localFileSystem.isDirectory(pathOne))
                 XCTAssertTrue(localFileSystem.isDirectory(pathTwo))
                 // Their paths should be different.