Skip to content

Commit 2a2729e

Browse files
committed
Mostly explicit import tools-support-core APIs
Switch to explicitly importing the tools-support-core API surface to identify what we are depending on. This will help ween swift-driver off of swift-tools-support-core in the long run.
1 parent 35cb702 commit 2a2729e

File tree

63 files changed

+246
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+246
-70
lines changed

Sources/SwiftDriver/Driver/Driver.swift

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,23 @@
99
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1010
//
1111
//===----------------------------------------------------------------------===//
12-
import TSCBasic
1312
import SwiftOptions
1413

1514
import class Dispatch.DispatchQueue
1615

16+
import TSCBasic // <<<
17+
import class TSCBasic.DiagnosticsEngine
18+
import enum TSCBasic.ProcessEnv
19+
import protocol TSCBasic.DiagnosticData
20+
import protocol TSCBasic.FileSystem
21+
import protocol TSCBasic.OutputByteStream
22+
import struct TSCBasic.AbsolutePath
23+
import struct TSCBasic.Diagnostic
24+
import struct TSCBasic.FileInfo
25+
import struct TSCBasic.RelativePath
26+
import var TSCBasic.localFileSystem
27+
import var TSCBasic.stderrStream
28+
import var TSCBasic.stdoutStream
1729
import enum TSCUtility.Diagnostics
1830
import struct TSCUtility.Version
1931

Sources/SwiftDriver/Driver/OutputFileMap.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
import TSCBasic
1413
import struct Foundation.Data
1514
import class Foundation.JSONEncoder
1615
import class Foundation.JSONDecoder
1716

17+
import class TSCBasic.DiagnosticsEngine
18+
import protocol TSCBasic.FileSystem
19+
import struct TSCBasic.AbsolutePath
20+
import struct TSCBasic.ByteString
21+
import struct TSCBasic.RelativePath
22+
1823
/// Mapping of input file paths to specific output files.
1924
public struct OutputFileMap: Hashable, Codable {
2025
static let singleInputKey = try! VirtualPath.intern(path: ".")

Sources/SwiftDriver/Driver/ToolExecutionDelegate.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1010
//
1111
//===----------------------------------------------------------------------===//
12-
import TSCBasic
1312

1413
#if canImport(Darwin)
1514
import Darwin.C
@@ -22,6 +21,13 @@ import Glibc
2221
#error("Missing libc or equivalent")
2322
#endif
2423

24+
import TSCBasic // <<<
25+
import class TSCBasic.DiagnosticsEngine
26+
import struct TSCBasic.Diagnostic
27+
import struct TSCBasic.ProcessResult
28+
import var TSCBasic.stderrStream
29+
import var TSCBasic.stdoutStream
30+
2531
/// Delegate for printing execution information on the command-line.
2632
@_spi(Testing) public final class ToolExecutionDelegate: JobExecutionDelegate {
2733
/// Quasi-PIDs are _negative_ PID-like unique keys used to

Sources/SwiftDriver/Execution/ArgsResolver.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import class Foundation.NSLock
14-
import TSCBasic
14+
15+
import TSCBasic // <<<
16+
import func TSCBasic.withTemporaryDirectory
17+
import protocol TSCBasic.FileSystem
18+
import struct TSCBasic.AbsolutePath
19+
1520
@_implementationOnly import Yams
1621

1722
/// How the resolver is to handle usage of response files

Sources/SwiftDriver/Execution/DriverExecutor.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
import TSCBasic
13+
import struct TSCBasic.ProcessResult
14+
1415
import struct Foundation.Data
1516
import class Foundation.JSONDecoder
1617
import var Foundation.EXIT_SUCCESS

Sources/SwiftDriver/Execution/ProcessProtocol.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
import TSCBasic
13+
import class TSCBasic.Process
14+
import struct TSCBasic.ProcessResult
15+
1416
import class Foundation.FileHandle
1517
import struct Foundation.Data
1618

Sources/SwiftDriver/ExplicitModuleBuilds/ClangVersionedDependencyResolution.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
import TSCBasic
13+
import func TSCBasic.determineTempDirectory
1414

1515
/// A map from a module identifier to a set of module dependency graphs
1616
/// Used to compute distinct graphs corresponding to different target versions for a given clang module

Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1010
//
1111
//===----------------------------------------------------------------------===//
12-
import TSCBasic
12+
13+
import struct TSCBasic.SHA256
14+
import struct TSCBasic.AbsolutePath
15+
1316
import struct Foundation.Data
1417
import class Foundation.JSONEncoder
1518

Sources/SwiftDriver/ExplicitModuleBuilds/InterModuleDependencies/CommonDependencyOperations.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1010
//
1111
//===----------------------------------------------------------------------===//
12-
import TSCBasic
12+
13+
import func TSCBasic.topologicalSort
1314

1415
@_spi(Testing) public extension InterModuleDependencyGraph {
1516
/// For targets that are built alongside the driver's current module, the scanning action will report them as

Sources/SwiftDriver/ExplicitModuleBuilds/InterModuleDependencies/InterModuleDependencyOracle.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
import TSCBasic
13+
import protocol TSCBasic.FileSystem
14+
import struct TSCBasic.AbsolutePath
15+
1416
import Dispatch
1517

1618
// An inter-module dependency oracle, responsible for responding to queries about

0 commit comments

Comments
 (0)