PackageLoading: make some of the private API more public

This extends the visibility of some of the private implementation to the
package level to allow use for testing without `@testable` imports.

Author: compnerd

Sources/PackageLoading/ManifestLoader.swift

@@ -1013,16 +1013,16 @@ public final class ManifestLoader: ManifestLoaderProtocol {
 }
 
 extension ManifestLoader {
-    struct CacheKey: Hashable {
+    package struct CacheKey: Hashable {
         let packageIdentity: PackageIdentity
         let manifestPath: AbsolutePath
         let manifestContents: [UInt8]
         let toolsVersion: ToolsVersion
         let env: Environment
         let swiftpmVersion: String
-        let sha256Checksum: String
+        package let sha256Checksum: String
 
-        init (packageIdentity: PackageIdentity,
+        package init (packageIdentity: PackageIdentity,
               packageLocation: String,
               manifestPath: AbsolutePath,
               toolsVersion: ToolsVersion,
@@ -1051,7 +1051,7 @@ extension ManifestLoader {
             self.sha256Checksum = sha256Checksum
         }
 
-        func hash(into hasher: inout Hasher) {
+        package func hash(into hasher: inout Hasher) {
             hasher.combine(self.sha256Checksum)
         }
 
@@ -1082,7 +1082,7 @@ extension ManifestLoader {
 }
 
 extension ManifestLoader {
-    struct EvaluationResult: Codable {
+    package struct EvaluationResult: Codable {
         /// The path to the diagnostics file (.dia).
         ///
         /// This is only present if serialized diagnostics are enabled.
@@ -1094,11 +1094,18 @@ extension ManifestLoader {
         var compilerOutput: String?
 
         /// The manifest in JSON format.
-        var manifestJSON: String?
+        package var manifestJSON: String?
 
         /// The command line used to compile the manifest
         var compilerCommandLine: [String]?
 
+        package init(diagnosticFile: AbsolutePath? = nil, compilerOutput: String? = nil, manifestJSON: String? = nil, compilerCommandLine: [String]? = nil) {
+            self.diagnosticFile = diagnosticFile
+            self.compilerOutput = compilerOutput
+            self.manifestJSON = manifestJSON
+            self.compilerCommandLine = compilerCommandLine
+        }
+
         /// Any non-compiler error that might have occurred during manifest loading.
         ///
         /// For e.g., we could have failed to spawn the process or create temporary file.

Sources/PackageLoading/PkgConfig.swift

@@ -159,7 +159,7 @@ extension PkgConfig {
 ///
 /// See: https://www.freedesktop.org/wiki/Software/pkg-config/
 // This is only internal so it can be unit tested.
-internal struct PkgConfigParser {
+package struct PkgConfigParser {
     public let pcFile: Basics.AbsolutePath
     private let fileSystem: FileSystem
     public private(set) var variables = [String: String]()
@@ -458,7 +458,7 @@ internal struct PkgConfigParser {
 }
 
 // This is only internal so it can be unit tested.
-internal struct PCFileFinder {
+package struct PCFileFinder {
     /// Cached results of locations `pkg-config` will search for `.pc` files
     /// FIXME: This shouldn't use a static variable, since the first lookup
     /// will cache the result of whatever `brewPrefix` was passed in.  It is
@@ -512,7 +512,7 @@ internal struct PCFileFinder {
     /// again when instantiating a `PCFileFinder()`.  This is intended only for
     /// use by testing.  This is a temporary workaround for the use of a static
     /// variable by this class.
-    internal static func resetCachedPkgConfigPaths() {
+    package static func resetCachedPkgConfigPaths() {
         PCFileFinder.pkgConfigPaths = nil
     }
 
@@ -539,7 +539,7 @@ internal struct PCFileFinder {
     }
 }
 
-internal enum PkgConfigError: Swift.Error, CustomStringConvertible {
+package enum PkgConfigError: Swift.Error, CustomStringConvertible {
     case couldNotFindConfigFile(name: String)
     case parsingError(String)
     case prohibitedFlags(String)