Merge pull request #2354 from aciidb0mb3r/warnings

Fix warnings

Author: aciidgh

Sources/PackageGraph/Pubgrub.swift

@@ -213,8 +213,7 @@ public struct Incompatibility: Equatable, Hashable {
         // Remove the root package from generated incompatibilities, since it will
         // always be selected.
         var terms = terms
-        if terms.count > 1,
-            case .conflict(conflict: _, other: _) = cause,
+        if terms.count > 1, cause.isConflict,
             terms.contains(where: { $0.isPositive && $0.package == root }) {
             terms = OrderedSet(terms.filter { !$0.isPositive || $0.package != root })
         }
@@ -262,6 +261,11 @@ extension Incompatibility {
     ///         └────────────┘
     /// ```
     indirect enum Cause: Equatable, Hashable {
+        struct ConflictCause: Hashable {
+            let conflict: Incompatibility
+            let other: Incompatibility
+        }
+
         /// The root incompatibility.
         case root
 
@@ -271,7 +275,7 @@ extension Incompatibility {
 
         /// The incompatibility was derived from two others during conflict
         /// resolution.
-        case conflict(conflict: Incompatibility, other: Incompatibility)
+        case conflict(cause: ConflictCause)
 
         /// There exists no version to fulfill the specified requirement.
         case noAvailableVersion
@@ -1104,7 +1108,7 @@ public final class PubgrubDependencyResolver {
             incompatibility = Incompatibility(
                 OrderedSet(newTerms),
                 root: root!,
-                cause: .conflict(conflict: incompatibility, other: priorCause))
+                cause: .conflict(cause: .init(conflict: incompatibility, other: priorCause)))
             createdIncompatibility = true
 
             log("CR: \(mostRecentTerm?.description ?? "") is\(difference != nil ? " partially" : "") satisfied by \(_mostRecentSatisfier)")
@@ -1193,9 +1197,9 @@ private final class DiagnosticReportBuilder {
         /// Populate `derivations`.
         func countDerivations(_ i: Incompatibility) {
             derivations[i, default: 0] += 1
-            if case .conflict(let lhs, let rhs) = i.cause {
-                countDerivations(lhs)
-                countDerivations(rhs)
+            if case .conflict(let cause) = i.cause {
+                countDerivations(cause.conflict)
+                countDerivations(cause.other)
             }
         }
 

Sources/PackageLoading/ModuleMapGenerator.swift

@@ -183,7 +183,7 @@ public struct ModuleMapGenerator {
 extension ModuleMapGenerator.ModuleMapError: CustomStringConvertible {
     public var description: String {
         switch self {
-        case .unsupportedIncludeLayoutForModule(let (name, problem)):
+        case .unsupportedIncludeLayoutForModule(let name, let problem):
             return "target '\(name)' failed modulemap generation; \(problem)"
         }
     }
@@ -192,15 +192,15 @@ extension ModuleMapGenerator.ModuleMapError: CustomStringConvertible {
 extension ModuleMapGenerator.ModuleMapError.UnsupportedIncludeLayoutType: CustomStringConvertible {
     public var description: String {
         switch self {
-        case .umbrellaHeaderWithAdditionalNonEmptyDirectories(let (umbrella, dirs)):
+        case .umbrellaHeaderWithAdditionalNonEmptyDirectories(let umbrella, let dirs):
             return "umbrella header defined at '\(umbrella)', but directories exist: " +
                 dirs.map({ $0.description }).sorted().joined(separator: ", ") +
                 "; consider removing them"
-        case .umbrellaHeaderWithAdditionalDirectoriesInIncludeDirectory(let (umbrella, dirs)):
+        case .umbrellaHeaderWithAdditionalDirectoriesInIncludeDirectory(let umbrella, let dirs):
             return "umbrella header defined at '\(umbrella)', but more than one directories exist: " +
                 dirs.map({ $0.description }).sorted().joined(separator: ", ") +
                 "; consider reducing them to one"
-        case .umbrellaHeaderWithAdditionalFilesInIncludeDirectory(let (umbrella, files)):
+        case .umbrellaHeaderWithAdditionalFilesInIncludeDirectory(let umbrella, let files):
             return "umbrella header defined at '\(umbrella)', but files exist:" +
                 files.map({ $0.description }).sorted().joined(separator: ", ") +
                 "; consider removing them"

Sources/TSCUtility/PkgConfig.swift

@@ -210,7 +210,7 @@ struct PkgConfigParser {
         variables["pcfiledir"] = pcFile.parentDirectory.pathString
 
         // Add pc_sysrootdir variable. This is the path of the sysroot directory for pc files.
-        variables["pc_sysrootdir"] = Process.env["PKG_CONFIG_SYSROOT_DIR"] ?? "/"
+        variables["pc_sysrootdir"] = ProcessEnv.vars["PKG_CONFIG_SYSROOT_DIR"] ?? "/"
 
         let fileContents = try fileSystem.readFileContents(pcFile)
         // FIXME: Should we error out instead if content is not UTF8 representable?

Tests/PackageLoadingTests/PD5LoadingTests.swift

@@ -46,7 +46,7 @@ class PackageDescription5LoadingTests: XCTestCase {
     ) {
         do {
             try loadManifestThrowing(contents, line: line, body: body)
-        } catch ManifestParseError.invalidManifestFormat(let error) {
+        } catch ManifestParseError.invalidManifestFormat(let error, _) {
             print(error)
             XCTFail(file: #file, line: line)
         } catch {