Mostly explicit import tools-support-core APIs

Sources/SwiftDriver/Driver/Driver.swift

@@ -9,11 +9,23 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
 import SwiftOptions
 
 import class Dispatch.DispatchQueue
 
+import TSCBasic // <<<
+import class TSCBasic.DiagnosticsEngine
+import enum TSCBasic.ProcessEnv
+import protocol TSCBasic.DiagnosticData
+import protocol TSCBasic.FileSystem
+import protocol TSCBasic.OutputByteStream
+import struct TSCBasic.AbsolutePath
+import struct TSCBasic.Diagnostic
+import struct TSCBasic.FileInfo
+import struct TSCBasic.RelativePath
+import var TSCBasic.localFileSystem
+import var TSCBasic.stderrStream
+import var TSCBasic.stdoutStream
 import enum TSCUtility.Diagnostics
 import struct TSCUtility.Version
 

Sources/SwiftDriver/Driver/OutputFileMap.swift

@@ -10,11 +10,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
 import struct Foundation.Data
 import class Foundation.JSONEncoder
 import class Foundation.JSONDecoder
 
+import class TSCBasic.DiagnosticsEngine
+import protocol TSCBasic.FileSystem
+import struct TSCBasic.AbsolutePath
+import struct TSCBasic.ByteString
+import struct TSCBasic.RelativePath
+
 /// Mapping of input file paths to specific output files.
 public struct OutputFileMap: Hashable, Codable {
   static let singleInputKey = try! VirtualPath.intern(path: ".")

Sources/SwiftDriver/Driver/ToolExecutionDelegate.swift

@@ -9,7 +9,6 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
 
 #if canImport(Darwin)
 import Darwin.C
@@ -22,6 +21,13 @@ import Glibc
 #error("Missing libc or equivalent")
 #endif
 
+import TSCBasic // <<<
+import class TSCBasic.DiagnosticsEngine
+import struct TSCBasic.Diagnostic
+import struct TSCBasic.ProcessResult
+import var TSCBasic.stderrStream
+import var TSCBasic.stdoutStream
+
 /// Delegate for printing execution information on the command-line.
 @_spi(Testing) public final class ToolExecutionDelegate: JobExecutionDelegate {
   /// Quasi-PIDs are _negative_ PID-like unique keys used to

Sources/SwiftDriver/Execution/ArgsResolver.swift

@@ -11,7 +11,12 @@
 //===----------------------------------------------------------------------===//
 
 import class Foundation.NSLock
-import TSCBasic
+
+import TSCBasic // <<<
+import func TSCBasic.withTemporaryDirectory
+import protocol TSCBasic.FileSystem
+import struct TSCBasic.AbsolutePath
+
 @_implementationOnly import Yams
 
 /// How the resolver is to handle usage of response files

Sources/SwiftDriver/Execution/DriverExecutor.swift

@@ -10,7 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
+import struct TSCBasic.ProcessResult
+
 import struct Foundation.Data
 import class Foundation.JSONDecoder
 import var Foundation.EXIT_SUCCESS

Sources/SwiftDriver/Execution/ProcessProtocol.swift

@@ -10,7 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
+import class TSCBasic.Process
+import struct TSCBasic.ProcessResult
+
 import class Foundation.FileHandle
 import struct Foundation.Data
 

Sources/SwiftDriver/ExplicitModuleBuilds/ClangVersionedDependencyResolution.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
+import func TSCBasic.determineTempDirectory
 
 /// A map from a module identifier to a set of module dependency graphs
 /// Used to compute distinct graphs corresponding to different target versions for a given clang module

Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift

@@ -9,7 +9,10 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
+import struct TSCBasic.SHA256
+import struct TSCBasic.AbsolutePath
+
 import struct Foundation.Data
 import class Foundation.JSONEncoder
 

Sources/SwiftDriver/ExplicitModuleBuilds/InterModuleDependencies/CommonDependencyOperations.swift

@@ -9,7 +9,8 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
+import func TSCBasic.topologicalSort
 
 @_spi(Testing) public extension InterModuleDependencyGraph {
   /// For targets that are built alongside the driver's current module, the scanning action will report them as

Sources/SwiftDriver/ExplicitModuleBuilds/InterModuleDependencies/InterModuleDependencyOracle.swift

@@ -10,7 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
+import protocol TSCBasic.FileSystem
+import struct TSCBasic.AbsolutePath
+
 import Dispatch
 
 // An inter-module dependency oracle, responsible for responding to queries about

Sources/SwiftDriver/ExplicitModuleBuilds/ModuleDependencyScanning.swift

@@ -10,7 +10,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
+import TSCBasic // <<<
+import protocol TSCBasic.FileSystem
+import struct TSCBasic.AbsolutePath
+import struct TSCBasic.Diagnostic
+import var TSCBasic.localFileSystem
+import var TSCBasic.stdoutStream
+
 import SwiftOptions
 import struct Foundation.Data
 import class Foundation.JSONEncoder

Sources/SwiftDriver/IncrementalCompilation/BuildRecord.swift

@@ -9,7 +9,11 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
+import class TSCBasic.DiagnosticsEngine
+import struct TSCBasic.AbsolutePath
+import struct TSCBasic.Diagnostic
+
 @_implementationOnly import Yams
 
 /// Holds the info about inputs needed to plan incremenal compilation

Sources/SwiftDriver/IncrementalCompilation/BuildRecordInfo.swift

@@ -10,7 +10,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
+import class TSCBasic.DiagnosticsEngine
+import protocol TSCBasic.FileSystem
+import struct TSCBasic.AbsolutePath
+import struct TSCBasic.ByteString
+import struct TSCBasic.ProcessResult
+import struct TSCBasic.SHA256
+
 import SwiftOptions
 import class Dispatch.DispatchQueue
 

Sources/SwiftDriver/IncrementalCompilation/DependencyGraphDotFileWriter.swift

@@ -9,7 +9,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
+import TSCBasic // <<<
+import protocol TSCBasic.WritableByteStream
 
 // MARK: - Asking to write dot files / interface
 public struct DependencyGraphDotFileWriter {

Sources/SwiftDriver/IncrementalCompilation/DependencyKey.swift

@@ -9,7 +9,7 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
 import Dispatch
 
 /// A filename from another module

Sources/SwiftDriver/IncrementalCompilation/FirstWaveComputer.swift

@@ -10,7 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
+import protocol TSCBasic.FileSystem
+
 import class Dispatch.DispatchQueue
 
 extension IncrementalCompilationState {

Sources/SwiftDriver/IncrementalCompilation/IncrementalCompilationProtectedState.swift

@@ -11,9 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 import Dispatch
-import TSCBasic
 import SwiftOptions
 
+import protocol TSCBasic.FileSystem
 import struct TSCUtility.Version
 
 extension IncrementalCompilationState {

Sources/SwiftDriver/IncrementalCompilation/IncrementalCompilationState+Extensions.swift

@@ -9,10 +9,15 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
 import SwiftOptions
 import protocol Foundation.LocalizedError
 
+import class TSCBasic.DiagnosticsEngine
+import protocol TSCBasic.FileSystem
+import struct TSCBasic.Diagnostic
+import struct TSCBasic.ProcessResult
+
 /// In a separate file to ensure that ``IncrementalCompilationState/protectedState``
 /// can only be accessed via ``IncrementalCompilationState/blockingConcurrentMutation(_:)`` and
 /// ``IncrementalCompilationState/blockingConcurrentAccessOrMutation(_:)``.

Sources/SwiftDriver/IncrementalCompilation/IncrementalCompilationState.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Dispatch
-import TSCBasic
 import SwiftOptions
 
 /// An instance of `IncrementalCompilationState` encapsulates the data necessary

Sources/SwiftDriver/IncrementalCompilation/IncrementalDependencyAndInputSetup.swift

@@ -10,10 +10,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
 import SwiftOptions
 import class Dispatch.DispatchQueue
 
+import class TSCBasic.DiagnosticsEngine
+import protocol TSCBasic.FileSystem
+
 // Initial incremental state computation
 extension IncrementalCompilationState {
   static func computeIncrementalStateForPlanning(driver: inout Driver)

Sources/SwiftDriver/IncrementalCompilation/InputInfo.swift

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

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift

@@ -10,9 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
 import SwiftOptions
 
+import protocol TSCBasic.FileSystem
+import struct TSCBasic.ByteString
 import enum TSCUtility.BitcodeElement
 import enum TSCUtility.Bitstream
 import class TSCUtility.BitstreamWriter

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/DependencySource.swift

@@ -9,7 +9,8 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
+import class TSCBasic.DiagnosticsEngine
 
 // MARK: - DependencySource
 /// Points to the source of dependencies, i.e. the file read to obtain the information.

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/Integrator.swift

@@ -10,8 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
-
 extension ModuleDependencyGraph {
 
   // MARK: Integrator - state & creation

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/Node.swift

@@ -9,7 +9,6 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
 
 // MARK: - ModuleDependencyGraph.Node
 extension ModuleDependencyGraph {

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/Tracer.swift

@@ -9,7 +9,8 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
+import class TSCBasic.DiagnosticsEngine
 
 extension ModuleDependencyGraph {
 

Sources/SwiftDriver/IncrementalCompilation/SourceFileDependencyGraph.swift

@@ -9,8 +9,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
 
+import protocol TSCBasic.FileSystem
+import struct TSCBasic.ByteString
 import class TSCUtility.BitstreamWriter
 import enum TSCUtility.BitcodeElement
 import enum TSCUtility.Bitstream

Sources/SwiftDriver/IncrementalCompilation/SwiftSourceFile.swift

@@ -10,8 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
-
 /// Because the incremental compilation system treats files containing Swift source code specially,
 /// it is helpful to statically distinguish them wherever an input must be swift source code.
 public struct SwiftSourceFile: Hashable {

Sources/SwiftDriver/Jobs/APIDigesterJobs.swift

@@ -10,8 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import TSCBasic
-
 enum DigesterMode: String {
   case api, abi
 

Sources/SwiftDriver/Jobs/AutolinkExtractJob.swift

@@ -9,7 +9,8 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
+import struct TSCBasic.RelativePath
 
 // On ELF/WASM platforms there's no built in autolinking mechanism, so we
 // pull the info we need from the .o files directly and pass them as an

Sources/SwiftDriver/Jobs/CommandLineArguments.swift

@@ -9,9 +9,11 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
 import SwiftOptions
 
+import struct TSCBasic.AbsolutePath
+
 /// Utilities for manipulating a list of command line arguments, including
 /// constructing one from a set of ParsedOptions.
 extension Array where Element == Job.ArgTemplate {

Sources/SwiftDriver/Jobs/CompileJob.swift

@@ -9,9 +9,11 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import TSCBasic
+
 import SwiftOptions
 
+import struct TSCBasic.RelativePath
+
 extension Driver {
   /// Add the appropriate compile mode option to the command line for a compile job.
   mutating func addCompileModeOption(outputType: FileType?, commandLine: inout [Job.ArgTemplate]) {