Merge pull request swiftlang#153 from benlangmuir/tsc

Update SPM -> TSC module name prefixes

Author: aciidgh

Package.swift

@@ -81,7 +81,7 @@ let package = Package(
       // useful to any Swift package. Similar in spirit to SwiftPM's Basic module.
       .target(
         name: "SKSupport",
-        dependencies: ["SPMUtility"]),
+        dependencies: ["TSCUtility"]),
       .testTarget(
         name: "SKSupportTests",
         dependencies: ["SKSupport", "SKTestSupport"]),

Sources/LanguageServerProtocol/Messages.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 
 /// The set of known requests.
 ///

Sources/SKCore/BuildServerBuildSystem.swift

@@ -9,7 +9,7 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-import Basic
+import TSCBasic
 import LanguageServerProtocol
 import LanguageServerProtocolJSONRPC
 import SKSupport

Sources/SKCore/BuildSetup.swift

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import SKSupport
 
 /// Build configuration

Sources/SKCore/BuildSystem.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
-import Basic
+import TSCBasic
 
 /// Provider of FileBuildSettings and other build-related information.
 ///

Sources/SKCore/BuildSystemList.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 import LanguageServerProtocol
 
 /// Provides build settings from a list of build systems in priority order.

Sources/SKCore/CompilationDatabase.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SKSupport
-import Basic
+import TSCBasic
 import Foundation
 
 /// A single compilation database command.

Sources/SKCore/CompilationDatabaseBuildSystem.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SKSupport
-import Basic
+import TSCBasic
 import LanguageServerProtocol
 
 /// A `BuildSystem` based on loading clang-compatible compilation database(s).

Sources/SKCore/FallbackBuildSystem.swift

@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
-import Basic
-import enum SPMUtility.Platform
+import TSCBasic
+import enum TSCUtility.Platform
 
 /// A simple BuildSystem suitable as a fallback when accurate settings are unknown.
 public final class FallbackBuildSystem: BuildSystem {

Sources/SKCore/Toolchain.swift

@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import SKSupport
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 
 /// A Toolchain is a collection of related compilers and libraries meant to be used together to
 /// build and edit source code.

Sources/SKCore/ToolchainRegistry.swift

@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import SKSupport
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import Dispatch
 import Foundation
 

Sources/SKCore/XCToolchainPlist.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 import Foundation
 
 /// A helper type for decoding the Info.plist or ToolchainInfo.plist file from an .xctoolchain.

Sources/SKSupport/BuildConfiguration.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMUtility
+import TSCUtility
 
 public enum BuildConfiguration: String {
   case debug

Sources/SKSupport/ByteString.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 import Foundation
 
 extension ByteString {

Sources/SKSupport/FileSystem.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 import Foundation
 
 /// The home directory of the current user (same as returned by Foundation's `NSHomeDirectory` method).

Sources/SKSupport/Int.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMLibc
+import TSCLibc
 
 extension UInt8 {
   @inlinable

Sources/SKSupport/LogLevel.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMUtility
+import TSCUtility
 
 #if canImport(os)
 import os

Sources/SKSupport/Logging.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 import Foundation
 
 #if canImport(os)

Sources/SKSupport/Platform.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMUtility
+import TSCUtility
 
 extension Platform {
 

Sources/SKSupport/dlopen.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMLibc
+import TSCLibc
 
 public final class DLHandle {
   #if os(Windows)
@@ -84,7 +84,7 @@ public func dlopen(_ path: String?, mode: DLOpenFlags) throws -> DLHandle {
       throw DLError.open("LoadLibraryW failed: \(GetLastError())")
     }
   #else
-    guard let handle = SPMLibc.dlopen(path, mode.rawValue) else {
+    guard let handle = TSCLibc.dlopen(path, mode.rawValue) else {
       throw DLError.open(dlerror() ?? "unknown error")
     }
   #endif

Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift

@@ -12,8 +12,8 @@
 
 import LanguageServerProtocol
 import SKCore
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import SKSupport
 import Build
 import PackageModel
@@ -410,7 +410,7 @@ public final class BuildSettingProviderWorkspaceDelegate: WorkspaceDelegate {
 
   public func fetchingWillBegin(repository: String) {}
 
-  public func fetchingDidFinish(repository: String, diagnostic: Basic.Diagnostic?) {}
+  public func fetchingDidFinish(repository: String, diagnostic: TSCBasic.Diagnostic?) {}
 
   public func cloning(repository: String) {}
 
@@ -419,7 +419,7 @@ public final class BuildSettingProviderWorkspaceDelegate: WorkspaceDelegate {
   public func managedDependenciesDidUpdate(_ dependencies: AnySequence<ManagedDependency>) {}
 }
 
-extension Basic.Diagnostic.Behavior {
+extension TSCBasic.Diagnostic.Behavior {
   var asLogLevel: LogLevel {
     switch self {
     case .error: return .error

Sources/SKTestSupport/FileSystem.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 
 extension FileSystem {
 

Sources/SKTestSupport/SKSwiftPMTestWorkspace.swift

@@ -17,8 +17,8 @@ import SKCore
 import IndexStoreDB
 import ISDBTibs
 import ISDBTestSupport
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import XCTest
 import Foundation
 
@@ -108,7 +108,7 @@ extension SKSwiftPMTestWorkspace {
   }
 
   func build() throws {
-    try Basic.Process.checkNonZeroExit(arguments: [
+    try TSCBasic.Process.checkNonZeroExit(arguments: [
       String(toolchain.swiftc!.pathString.dropLast()),
       "build",
       "--package-path", sources.rootDirectory.path,

Sources/SKTestSupport/SKTibsTestWorkspace.swift

@@ -16,8 +16,8 @@ import SKCore
 import IndexStoreDB
 import ISDBTibs
 import ISDBTestSupport
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import XCTest
 import Foundation
 

Sources/SKTestSupport/TestServer.swift

@@ -12,7 +12,7 @@
 
 import SKSupport
 import SKCore
-import SPMUtility
+import TSCUtility
 import LanguageServerProtocol
 import LanguageServerProtocolJSONRPC
 import SourceKit

Sources/SourceKit/SourceKitServer.swift

@@ -14,11 +14,11 @@ import LanguageServerProtocol
 import SKCore
 import SKSupport
 import IndexStoreDB
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import Dispatch
 import Foundation
-import SPMLibc
+import TSCLibc
 
 public typealias URL = Foundation.URL
 

Sources/SourceKit/Workspace.swift

@@ -14,8 +14,8 @@ import LanguageServerProtocol
 import SKCore
 import SKSupport
 import IndexStoreDB
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import SKSwiftPMWorkspace
 
 /// Represents the configuration and state of a project or combination of projects being worked on

Sources/SourceKit/clangd/ClangLanguageServer.swift

@@ -12,7 +12,7 @@
 
 import SKSupport
 import SKCore
-import Basic
+import TSCBasic
 import LanguageServerProtocol
 import LanguageServerProtocolJSONRPC
 import Foundation

Sources/SourceKit/sourcekitd/CursorInfo.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
-import Basic
+import TSCBasic
 import sourcekitd
 
 /// Detailed information about a symbol under the cursor.

Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift

@@ -13,7 +13,7 @@
 import LanguageServerProtocol
 import SKCore
 import SKSupport
-import Basic
+import TSCBasic
 import sourcekitd
 import Dispatch
 import struct Foundation.CharacterSet

Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
-import Basic
+import TSCBasic
 import SKSupport
 import sourcekitd
 

Sources/sourcekit-lsp/main.swift

@@ -15,10 +15,10 @@ import LanguageServerProtocolJSONRPC
 import LanguageServerProtocol
 import SKSupport
 import SKCore
-import SPMLibc
+import TSCLibc
 import Dispatch
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import Foundation
 import sourcekitd // Not needed here, but fixes debugging...
 
@@ -62,7 +62,7 @@ let sync: Bool
 do {
   (buildSetup, sync) = try parseArguments()
 } catch {
-  fputs("error: \(error)\n", SPMLibc.stderr)
+  fputs("error: \(error)\n", TSCLibc.stderr)
   exit(1)
 }
 

Tests/SKCoreTests/BuildServerBuildSystemTests.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 import XCTest
 import SKCore
-import Basic
+import TSCBasic
 import LanguageServerProtocol
 
 final class BuildServerBuildSystemTests: XCTestCase {

Tests/SKCoreTests/CompilationDatabaseTests.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SKCore
-import Basic
+import TSCBasic
 import SKTestSupport
 import XCTest
 

Tests/SKCoreTests/FallbackBuildSystemTests.swift

@@ -12,7 +12,7 @@
 
 import SKCore
 import LanguageServerProtocol
-import Basic
+import TSCBasic
 import XCTest
 
 final class FallbackBuildSystemTests: XCTestCase {

Tests/SKCoreTests/ToolchainRegistryTests.swift

@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import SKCore
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import XCTest
 
 final class ToolchainRegistryTests: XCTestCase {