Rename Swift.Process to Swift.CommandLine

Author: parkera

Sources/Commands/Error.swift

@@ -70,7 +70,7 @@ extension Error: FixableError {
     case is OptionParserError:
         print(error: error)
         if isTTY(.stdErr) {
-            let argv0 = Process.arguments.first ?? "swift package"
+            let argv0 = CommandLine.arguments.first ?? "swift package"
             print("enter `\(argv0) --help' for usage information", to: &stderr)
         }
     case let error as FixableError:
@@ -89,7 +89,7 @@ private func print(error: Any) {
     if ColorWrap.isAllowed(for: .stdErr) {
         print(ColorWrap.wrap("error:", with: .Red, for: .stdErr), error, to: &stderr)
     } else {
-        let cmd = Process.arguments.first?.basename ?? "SwiftPM"
+        let cmd = CommandLine.arguments.first?.basename ?? "SwiftPM"
         print("\(cmd): error:", error, to: &stderr)
     }
 }

Sources/Commands/SwiftTestTool.swift

@@ -276,7 +276,7 @@ public struct SwiftTestTool: SwiftTool {
     /// - Returns: Path to XCTestHelper tool.
     private func xctestHelperPath() -> AbsolutePath {
         let xctestHelperBin = "swiftpm-xctest-helper"
-        let binDirectory = AbsolutePath(Process.arguments.first!.abspath).parentDirectory
+        let binDirectory = AbsolutePath(CommandLine.arguments.first!.abspath).parentDirectory
         // XCTestHelper tool is installed in libexec.
         let maybePath = binDirectory.appending("../libexec/swift/pm/").appending(RelativePath(xctestHelperBin))
         if maybePath.asString.isFile {

Sources/Commands/SwiftTool.swift

@@ -25,7 +25,7 @@ private let sharedPackageGraphLoader = PackageGraphLoader(manifestLoader: Manife
 
 public extension SwiftTool {
     init() {
-        self.init(args: Array(Process.arguments.dropFirst()))
+        self.init(args: Array(CommandLine.arguments.dropFirst()))
     }
 
     /// The shared package graph loader.

Sources/Commands/UserToolchain.swift

@@ -41,7 +41,7 @@ struct UserToolchain: Toolchain {
         do {
             SWIFT_EXEC = getenv("SWIFT_EXEC")
                 // use the swiftc installed alongside ourselves
-                ?? AbsolutePath(Process.arguments[0].abspath).appending("../swiftc").asString
+                ?? AbsolutePath(CommandLine.arguments[0].abspath).appending("../swiftc").asString
 
             clang = try getenv("CC") ?? POSIX.popen(whichClangArgs).chomp()
 

Sources/POSIX/chdir.swift

@@ -16,7 +16,7 @@ import var libc.errno
 */
 public func chdir(_ path: String) throws {
     if memo == nil {
-        let argv0 = try realpath(Process.arguments.first!)
+        let argv0 = try realpath(CommandLine.arguments.first!)
         let cwd = try realpath(getcwd())
         memo = (argv0: argv0, wd: cwd)
     }
@@ -37,5 +37,5 @@ public func getiwd() -> String {
 }
 
 public var argv0: String {
-    return memo?.argv0 ?? Process.arguments.first!
+    return memo?.argv0 ?? CommandLine.arguments.first!
 }

Sources/PackageDescription/Package.swift

@@ -88,9 +88,9 @@ public final class Package {
         // FIXME: Additional hackery here to avoid accessing 'arguments' in a
         // process whose 'main' isn't generated by Swift.
         // See https://bugs.swift.org/browse/SR-1119.
-        if Process.argc > 0 {
-            if let fileNoOptIndex = Process.arguments.index(of: "-fileno"),
-                   let fileNo = Int32(Process.arguments[fileNoOptIndex + 1]) {
+        if CommandLine.argc > 0 {
+            if let fileNoOptIndex = CommandLine.arguments.index(of: "-fileno"),
+                   let fileNo = Int32(CommandLine.arguments[fileNoOptIndex + 1]) {
                 dumpPackageAtExit(self, fileNo: fileNo)
             }
         }

Sources/swiftpm-xctest-helper/main.swift

@@ -22,11 +22,11 @@ import func Darwin.C.exit
 /// loading the bundle and then iterating the default Test Suite.
 func run() throws {
 
-    guard Process.arguments.count == 3 else {
+    guard CommandLine.arguments.count == 3 else {
         throw Error.invalidUsage
     }
-    let bundlePath = Process.arguments[1].normalizedPath()
-    let outputFile = Process.arguments[2].normalizedPath()
+    let bundlePath = CommandLine.arguments[1].normalizedPath()
+    let outputFile = CommandLine.arguments[2].normalizedPath()
 
     // Note that the bundle might write to stdout while it is being loaded, but we don't try to handle that here.
     // Instead the client should decide what to do with any extra output from this tool.

Tests/Functional/Utilities.swift

@@ -128,7 +128,7 @@ enum SwiftPMProduct {
         }
         fatalError()
       #else
-        return AbsolutePath(Process.arguments.first!.abspath).parentDirectory.appending(self.exec)
+        return AbsolutePath(CommandLine.arguments.first!.abspath).parentDirectory.appending(self.exec)
       #endif
     }
 

Tests/PackageLoading/ManifestTests.swift

@@ -49,8 +49,8 @@ private struct Resources: ManifestResourceProvider {
   #endif
     let libraryPath = bundleRoot()
 #else
-    let libraryPath = AbsolutePath(Process.arguments.first!.parentDirectory.abspath)
-    let swiftCompilerPath = AbsolutePath(Process.arguments.first!.abspath).appending("../swiftc")
+    let libraryPath = AbsolutePath(CommandLine.arguments.first!.parentDirectory.abspath)
+    let swiftCompilerPath = AbsolutePath(CommandLine.arguments.first!.abspath).appending("../swiftc")
 #endif
 }