Import Foundation and Dispatch types explicitly, where possible

Sources/SwiftDriver/Driver/Driver.swift

@@ -10,9 +10,11 @@
 //
 //===----------------------------------------------------------------------===//
 import TSCBasic
-import Foundation
 import SwiftOptions
 
+import struct Foundation.Date
+import class Dispatch.DispatchQueue
+
 import enum TSCUtility.Diagnostics
 import struct TSCUtility.Version
 

Sources/SwiftDriver/Driver/OutputFileMap.swift

@@ -11,7 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 import TSCBasic
-import Foundation
+import struct Foundation.Data
+import class Foundation.JSONEncoder
+import class Foundation.JSONDecoder
 
 /// Mapping of input file paths to specific output files.
 public struct OutputFileMap: Hashable, Codable {

Sources/SwiftDriver/Driver/WindowsExtensions.swift

@@ -10,8 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
-
 internal func executableName(_ name: String) -> String {
 #if os(Windows)
   if name.count > 4, name.suffix(from: name.index(name.endIndex, offsetBy: -4)) == ".exe" {

Sources/SwiftDriver/Execution/DriverExecutor.swift

@@ -11,7 +11,10 @@
 //===----------------------------------------------------------------------===//
 
 import TSCBasic
-import Foundation
+import struct Foundation.Date
+import struct Foundation.Data
+import class Foundation.JSONDecoder
+import var Foundation.EXIT_SUCCESS
 
 /// A type that is capable of executing compilation jobs on some underlying
 /// build service.

Sources/SwiftDriver/Execution/ParsableOutput.swift

@@ -10,7 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
+import struct Foundation.Data
+import class Foundation.JSONEncoder
 
 @_spi(Testing) public struct ParsableMessage {
   public enum Kind {

Sources/SwiftDriver/Execution/ProcessProtocol.swift

@@ -11,7 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import TSCBasic
-import Foundation
+import class Foundation.FileHandle
+import struct Foundation.Data
 
 /// Abstraction for functionality that allows working with subprocesses.
 public protocol ProcessProtocol {

Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift

@@ -10,7 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 import TSCBasic
-import Foundation
+import struct Foundation.Data
+import class Foundation.JSONEncoder
 
 /// A map from a module identifier to a path to its .swiftmodule file.
 /// Deprecated in favour of the below `ExternalTargetModuleDetails`

Sources/SwiftDriver/ExplicitModuleBuilds/ModuleDependencyScanning.swift

@@ -10,9 +10,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import TSCBasic
 import SwiftOptions
+import struct Foundation.Data
+import class Foundation.JSONEncoder
+import class Foundation.JSONDecoder
+import var Foundation.EXIT_SUCCESS
 
 extension Diagnostic.Message {
   static func warn_scanner_frontend_fallback() -> Diagnostic.Message {

Sources/SwiftDriver/IncrementalCompilation/BuildRecord.swift

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 import TSCBasic
-import Foundation
 @_implementationOnly import Yams
+import struct Foundation.Date
 
 /// Holds the info about inputs needed to plan incremenal compilation
 /// A.k.a. BuildRecord was the legacy name

Sources/SwiftDriver/IncrementalCompilation/BuildRecordInfo.swift

@@ -10,9 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import TSCBasic
 import SwiftOptions
+import struct Foundation.Date
+import class Dispatch.DispatchQueue
 
 /// Holds information required to read and write the build record (aka
 /// compilation record).

Sources/SwiftDriver/IncrementalCompilation/FirstWaveComputer.swift

@@ -10,8 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import TSCBasic
+import struct Foundation.Date
+import class Dispatch.DispatchQueue
 
 extension IncrementalCompilationState {
 

Sources/SwiftDriver/IncrementalCompilation/IncrementalCompilationState+Extensions.swift

@@ -10,8 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 import TSCBasic
-import Foundation
 import SwiftOptions
+import struct Foundation.Date
+import protocol Foundation.LocalizedError
 
 /// In a separate file to ensure that ``IncrementalCompilationState/protectedState``
 /// can only be accessed via ``IncrementalCompilationState/blockingConcurrentMutation(_:)`` and

Sources/SwiftDriver/IncrementalCompilation/IncrementalDependencyAndInputSetup.swift

@@ -11,8 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 import TSCBasic
-import Foundation
 import SwiftOptions
+import struct Foundation.Date
+import class Dispatch.DispatchQueue
 
 // Initial incremental state computation
 extension IncrementalCompilationState {

Sources/SwiftDriver/IncrementalCompilation/InputInfo.swift

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import TSCBasic
+import struct Foundation.Date
 
 /// Contains information about the current status of an input to the incremental
 /// build.

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import TSCBasic
 import SwiftOptions
 
@@ -20,6 +19,9 @@ import class TSCUtility.BitstreamWriter
 import protocol TSCUtility.BitstreamVisitor
 import struct TSCUtility.Bitcode
 import struct TSCUtility.Version
+import struct Foundation.Date
+import class Dispatch.DispatchQueue
+import struct Foundation.TimeInterval
 
 // MARK: - ModuleDependencyGraph
 

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/InternedStrings.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
+import class Dispatch.DispatchQueue
 
 public protocol InternedStringTableHolder {
   var internedStringTable: InternedStringTable {get}

Sources/SwiftDriver/Jobs/EmitSupportedFeaturesJob.swift

@@ -12,7 +12,8 @@
 
 import TSCBasic
 import SwiftOptions
-import Foundation
+import struct Foundation.Data
+import class Foundation.JSONDecoder
 
 /// Describes information about the compiler's supported arguments and features
 @_spi(Testing) public struct SupportedCompilerFeatures: Codable {

Sources/SwiftDriver/Jobs/Job.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import TSCBasic
-import Foundation
+import struct Foundation.Date
 
 /// A job represents an individual subprocess that should be invoked during compilation.
 public struct Job: Codable, Equatable, Hashable {

Sources/SwiftDriver/Jobs/Planning.swift

@@ -12,7 +12,7 @@
 
 import TSCBasic
 import SwiftOptions
-import Foundation
+import class Foundation.JSONDecoder
 
 public enum PlanningError: Error, DiagnosticData {
   case replReceivedInput

Sources/SwiftDriver/Jobs/PrebuiltModulesJob.swift

@@ -11,7 +11,8 @@
 //===----------------------------------------------------------------------===//
 import TSCBasic
 import SwiftOptions
-import Foundation
+import class Foundation.JSONEncoder
+import class Foundation.JSONSerialization
 
 func getModuleFlags(_ path: VirtualPath, _ ignorable: Bool) throws -> [String] {
   let data = try localFileSystem.readFileContents(path).cString

Sources/SwiftDriver/SwiftScan/SwiftScan.swift

@@ -11,11 +11,10 @@
 //===----------------------------------------------------------------------===//
 
 @_implementationOnly import CSwiftScan
-
 import TSCBasic
-import Foundation
-
 import struct TSCUtility.Version
+import func Foundation.strdup
+import func Foundation.free
 
 public enum DependencyScanningError: Error, DiagnosticData {
   case missingRequiredSymbol(String)

Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

@@ -10,10 +10,12 @@
 //
 //===----------------------------------------------------------------------===//
 import TSCBasic
-import Foundation
 import SwiftOptions
 
 import struct TSCUtility.Version
+import struct Foundation.Data
+import class Foundation.JSONEncoder
+import class Foundation.JSONDecoder
 
 /// Toolchain for Darwin-based platforms, such as macOS and iOS.
 ///

Sources/SwiftDriver/Toolchains/Toolchain.swift

@@ -10,9 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import TSCBasic
 import SwiftOptions
+import class Foundation.Bundle
 
 public enum Tool: Hashable {
   case swiftCompiler

Sources/SwiftDriver/Utilities/DateAdditions.swift

@@ -10,7 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
+import struct Foundation.Date
+import protocol Foundation.LocalizedError
+import func Foundation.floor
 
 public extension Date {
   init(legacyDriverSecsAndNanos secsAndNanos: [Int]) throws {

Sources/SwiftDriver/Utilities/VirtualPath.swift

@@ -10,7 +10,13 @@
 //
 //===----------------------------------------------------------------------===//
 import TSCBasic
-import Foundation
+import struct Foundation.Data
+import struct Foundation.Date
+import struct Foundation.TimeInterval
+import class Dispatch.DispatchQueue
+#if canImport(Darwin)
+import var Foundation.kCFAbsoluteTimeIntervalSince1970
+#endif
 
 #if canImport(Darwin)
 import Darwin

Sources/SwiftDriverExecution/MultiJobExecutor.swift

@@ -12,11 +12,16 @@
 
 import TSCBasic
 import enum TSCUtility.Diagnostics
-
-import Foundation
-import Dispatch
 import SwiftDriver
 
+import class Dispatch.DispatchQueue
+import class Foundation.OperationQueue
+import struct Foundation.Date
+import class Foundation.FileHandle
+import var Foundation.EXIT_SUCCESS
+import var Foundation.EXIT_FAILURE
+import var Foundation.SIGINT
+
 // We either import the llbuildSwift shared library or the llbuild framework.
 #if canImport(llbuildSwift)
 @_implementationOnly import llbuildSwift

Sources/SwiftDriverExecution/SwiftDriverExecutor.swift

@@ -12,7 +12,8 @@
 
 import SwiftDriver
 import TSCBasic
-import Foundation
+import struct Foundation.Date
+import class Foundation.FileHandle
 
 public final class SwiftDriverExecutor: DriverExecutor {
   let diagnosticsEngine: DiagnosticsEngine

Sources/SwiftDriverExecution/llbuild.swift

@@ -13,8 +13,10 @@
 // FIXME: This is slightly modified from the SwiftPM version,
 // consider moving this to llbuild.
 
-import Foundation
 import TSCBasic
+import struct Foundation.Data
+import class Foundation.JSONEncoder
+import class Foundation.JSONDecoder
 
 // We either import the llbuildSwift shared library or the llbuild framework.
 #if canImport(llbuildSwift)

Tests/IncrementalTestFramework/Module.swift

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 import TSCBasic
-import Foundation
 
 @_spi(Testing) import SwiftDriver
 import SwiftOptions

Tests/SwiftDriverTests/IncrementalCompilationTests.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 import XCTest
 import TSCBasic
-import Foundation
 
 @_spi(Testing) import SwiftDriver
 import SwiftOptions

Tests/SwiftDriverTests/JobExecutorTests.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 import XCTest
 import TSCBasic
-import Foundation
 
 @_spi(Testing) import SwiftDriver
 import SwiftDriverExecution

Tests/SwiftDriverTests/ParsableMessageTests.swift

@@ -11,9 +11,9 @@
 //===----------------------------------------------------------------------===//
 import XCTest
 import TSCBasic
-import Foundation
 
 @_spi(Testing) import SwiftDriver
+import var Foundation.EXIT_SUCCESS
 
 final class ParsableMessageTests: XCTestCase {
   private func withHijackedBufferedErrorStream(
@@ -251,7 +251,7 @@ final class ParsableMessageTests: XCTestCase {
         try withHijackedBufferedErrorStream(in: path) { errorBuffer in
           let resultSuccess = ProcessResult(arguments: args!,
                                             environment: ProcessEnv.vars,
-                                            exitStatus: ProcessResult.ExitStatus.terminated(code: 0),
+                                            exitStatus: ProcessResult.ExitStatus.terminated(code: EXIT_SUCCESS),
                                             output: Result.success([]),
                                             stderrOutput: Result.success([]))
           // Emit the finished messages and examine the output
@@ -326,7 +326,7 @@ final class ParsableMessageTests: XCTestCase {
         // Now hijack the error stream and emit finished messages
         try withHijackedBufferedErrorStream(in: path) { errorBuffer in
 #if os(Windows)
-          let status = ProcessResult.ExitStatus.terminated(code: 0)
+          let status = ProcessResult.ExitStatus.terminated(code: EXIT_SUCCESS)
           let kind = "finished"
           let signal = ""
 #else

Tests/TestUtilities/DriverExtensions.swift

@@ -13,7 +13,8 @@
 @_spi(Testing) import SwiftDriver
 import SwiftDriverExecution
 import TSCBasic
-import Foundation
+import protocol Foundation.LocalizedError
+import var Foundation.EXIT_SUCCESS
 
 extension Driver {
   /// Initializer which creates an executor suitable for use in tests.

Tests/TestUtilities/OutputFileMapCreator.swift

@@ -11,7 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import TSCBasic
-import Foundation
+import struct Foundation.Data
+import class Foundation.JSONEncoder
 
 public struct OutputFileMapCreator {
   private let module: String