cleanup

Author: tomerd

Sources/PackageLoading/PackageBuilder.swift

@@ -12,7 +12,6 @@ import Basics
 import Dispatch
 import PackageModel
 import TSCBasic
-//import TSCUtility
 
 /// An error in the structure or layout of a package.
 public enum ModuleError: Swift.Error {

Sources/PackageLoading/TargetSourcesBuilder.swift

@@ -12,7 +12,6 @@ import Basics
 import Foundation
 import PackageModel
 import TSCBasic
-//import TSCUtility
 
 /// A utility to compute the source/resource files of a target.
 public struct TargetSourcesBuilder {

Sources/PackageLoading/ToolsVersionLoader.swift

@@ -12,7 +12,6 @@ import Basics
 import Foundation
 import PackageModel
 import TSCBasic
-//import TSCUtility
 
 /// Protocol for the manifest loader interface.
 public protocol ToolsVersionLoaderProtocol {

Sources/PackageModel/PackageReference.swift

@@ -6,7 +6,7 @@
 
  See http://swift.org/LICENSE.txt for license information
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
-*/
+ */
 
 import Basics
 import Foundation
@@ -148,7 +148,7 @@ extension PackageReference: CustomStringConvertible {
 
 extension PackageReference.Kind: Encodable {
     private enum CodingKeys: String, CodingKey {
-        case root, fileSystem, localSourceControl, remoteSourceControl,registry
+        case root, fileSystem, localSourceControl, remoteSourceControl, registry
     }
 
     public func encode(to encoder: Encoder) throws {

Sources/Workspace/SourceControlPackageContainer.swift

@@ -71,7 +71,7 @@ internal final class SourceControlPackageContainer: PackageContainer, CustomStri
     /// valid or not.
     internal var validToolsVersionsCache = ThreadSafeKeyValueStore<Version, Bool>()
 
-    public init(
+    init(
         package: PackageReference,
         identityResolver: IdentityResolver,
         repositorySpecifier: RepositorySpecifier,
@@ -379,16 +379,3 @@ fileprivate extension Git {
         }
     }
 }
-
-fileprivate extension PackageReference {
-    func makeRepositorySpecifier() throws -> RepositorySpecifier {
-        switch self.kind {
-        case .localSourceControl(let path):
-            return .init(path: path)
-        case .remoteSourceControl(let url):
-            return .init(url: url)
-        default:
-            throw StringError("invalid dependency kind \(self.kind)")
-        }
-    }
-}

Sources/Workspace/Workspace.swift

@@ -3045,7 +3045,7 @@ fileprivate extension DiagnosticsEngine {
     }
 }
 
-fileprivate extension PackageReference {
+internal extension PackageReference {
     func makeRepositorySpecifier() throws -> RepositorySpecifier {
         switch self.kind {
         case .localSourceControl(let path):