Compatibility updates to reflect the removal of swift-indent, and the removal of swift-autolink-extract on macOS

Author: owenv

Sources/SwiftDriver/Driver/Driver.swift

@@ -576,8 +576,6 @@ extension Driver {
       return .batch
     case "swift-autolink-extract":
       return .autolinkExtract
-    case "swift-indent":
-      return .indent
     default:
       throw Error.invalidDriverName(driverName)
     }

Sources/SwiftDriver/Driver/DriverKind.swift

@@ -17,7 +17,6 @@ public enum DriverKind {
   case moduleWrap
   case frontend
   case autolinkExtract
-  case indent
 
   /// Returns true if driver kind is Swift compiler.
   var isSwiftCompiler: Bool {
@@ -41,9 +40,6 @@ extension DriverKind {
     case .frontend:
       return ["swift", "-frontend"]
 
-    case .indent:
-      return ["swift-indent"]
-
     case .interactive:
       return ["swift"]
 
@@ -60,9 +56,6 @@ extension DriverKind {
     case .frontend:
       return "Swift frontend"
 
-    case .indent:
-      return "Swift Format Tool"
-
     case .batch, .interactive:
       return "Swift compiler"
 

Sources/SwiftDriver/Options/Option.swift

@@ -142,9 +142,6 @@ extension Option {
     case .frontend:
       return attributes.contains(.frontend)
 
-    case .indent:
-      return attributes.contains(.indent)
-
     case .interactive:
       return !attributes.contains(.noInteractive)
 

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -125,7 +125,6 @@ final class SwiftDriverTests: XCTestCase {
 
     try assertArgs("swiftc", "--driver-mode=swift", parseTo: .interactive, leaving: [])
     try assertArgs("swiftc", "--driver-mode=swift-autolink-extract", parseTo: .autolinkExtract, leaving: [])
-    try assertArgs("swiftc", "--driver-mode=swift-indent", parseTo: .indent, leaving: [])
     try assertArgs("swift", "--driver-mode=swift-autolink-extract", parseTo: .autolinkExtract, leaving: [])
 
     try assertArgs("swift", "-zelda", parseTo: .interactive, leaving: ["-zelda"])
@@ -761,7 +760,8 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertFalse(cmd.contains(.flag("-dylib")))
       XCTAssertFalse(cmd.contains(.flag("-shared")))
     }
-
+    // Only run tests which require swift-autolink-extract on Linux.
+    #if os(Linux)
     do {
       // linux target
       var driver = try Driver(args: commonArgs + ["-emit-library", "-target", "x86_64-unknown-linux"])
@@ -818,6 +818,7 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertFalse(cmd.contains(.flag("-static")))
       XCTAssertFalse(cmd.contains(.flag("-shared")))
     }
+    #endif
   }
 
   func testSanitizerArgs() throws {