Clean up merge.

A few things slipped through the git merge including parts of the
prebuilts feature and the new PIF/PIF Builder.

Author: dschaefer2

Sources/Basics/Graph/GraphAlgorithms.swift

@@ -131,50 +131,3 @@ public func depthFirstSearch<T: Hashable>(
         }
     }
 }
-
-/// Implements a pre-order depth-first search that traverses the whole graph and
-/// doesn't distinguish between unique and duplicate nodes. The visitor can abort
-/// a path as needed to prune the tree.
-/// The method expects the graph to be acyclic but doesn't check that.
-///
-/// - Parameters:
-///   - nodes: The list of input nodes to sort.
-///   - successors: A closure for fetching the successors of a particular node.
-///   - onNext: A callback to indicate the node currently being processed
-///             including its parent (if any) and its depth. Returns whether to
-///             continue down the current path.
-///
-/// - Complexity: O(v + e) where (v, e) are the number of vertices and edges
-/// reachable from the input nodes via the relation.
-public enum DepthFirstContinue {
-    case `continue`
-    case abort
-}
-
-public func depthFirstSearch<T: Hashable>(
-    _ nodes: [T],
-    successors: (T) throws -> [T],
-    visitNext: (T, _ parent: T?) throws -> DepthFirstContinue
-) rethrows {
-    var stack = OrderedSet<TraversalNode<T>>()
-
-    for node in nodes {
-        precondition(stack.isEmpty)
-        stack.append(TraversalNode(parent: nil, curr: node))
-
-        while !stack.isEmpty {
-            let node = stack.removeLast()
-
-            if try visitNext(node.curr, node.parent) == .continue {
-                for succ in try successors(node.curr) {
-                    stack.append(
-                        TraversalNode(
-                            parent: node.curr,
-                            curr: succ
-                        )
-                    )
-                }
-            }
-        }
-    }
-}

Sources/Build/BuildDescription/ModuleBuildDescription.swift

@@ -195,30 +195,8 @@ extension ModuleBuildDescription {
         var dependencies: [Dependency] = []
         plan.traverseDependencies(of: self) { product, _, description in
             dependencies.append(.product(product, description))
-            return .continue
         } onModule: { module, _, description in
             dependencies.append(.module(module, description))
-            return .continue
-        }
-        return dependencies
-    }
-
-    package func recursiveLinkDependencies(using plan: BuildPlan) -> [Dependency] {
-        var dependencies: [Dependency] = []
-        plan.traverseDependencies(of: self) { product, _, description in
-            guard product.type != .macro && product.type != .plugin else {
-                return .abort
-            }
-
-            dependencies.append(.product(product, description))
-            return .continue
-        } onModule: { module, _, description in
-            guard module.type != .macro && module.type != .plugin else {
-                return .abort
-            }
-
-            dependencies.append(.module(module, description))
-            return .continue
         }
         return dependencies
     }

Sources/Build/BuildPlan/BuildPlan.swift

@@ -1175,8 +1175,8 @@ extension BuildPlan {
 
     package func traverseDependencies(
         of description: ModuleBuildDescription,
-        onProduct: (ResolvedProduct, BuildParameters.Destination, ProductBuildDescription?) -> DepthFirstContinue,
-        onModule: (ResolvedModule, BuildParameters.Destination, ModuleBuildDescription?) -> DepthFirstContinue
+        onProduct: (ResolvedProduct, BuildParameters.Destination, ProductBuildDescription?) -> Void,
+        onModule: (ResolvedModule, BuildParameters.Destination, ModuleBuildDescription?) -> Void
     ) {
         var visited = Set<TraversalNode>()
         func successors(
@@ -1217,16 +1217,16 @@ extension BuildPlan {
             case .package:
                 []
             }
-        } visitNext: { module, _ in
+        } onNext: { module, _ in
             switch module {
             case .package:
-                return .continue
+                break
 
             case .product(let product, let destination):
-                return onProduct(product, destination, self.description(for: product, context: destination))
+                onProduct(product, destination, self.description(for: product, context: destination))
 
             case .module(let module, let destination):
-                return onModule(module, destination, self.description(for: module, context: destination))
+                onModule(module, destination, self.description(for: module, context: destination))
             }
         }
     }

Sources/SwiftBuildSupport/PIF.swift

@@ -285,5 +285,3 @@ extension PIF {
         workspace.signature = try signature(of: workspace)
     }
 }
-
-#endif // SwiftBuild

Sources/SwiftBuildSupport/PIFBuilder.swift

@@ -101,7 +101,6 @@ public final class PIFBuilder {
         printPIFManifestGraphviz: Bool = false,
         buildParameters: BuildParameters
     ) throws -> String {
-        #if canImport(SwiftBuild)
         let encoder = prettyPrint ? JSONEncoder.makeWithDefaults() : JSONEncoder()
 
         if !preservePIFModelStructure {
@@ -128,10 +127,6 @@ public final class PIFBuilder {
 
         return pifString
     }
-    
-    #if canImport(SwiftBuild)
-    
-    private var cachedPIF: PIF.TopLevelObject?
 
     private var cachedPIF: PIF.TopLevelObject?
 
@@ -189,8 +184,6 @@ public final class PIFBuilder {
             return PIF.TopLevelObject(workspace: workspace)
         }
     }
-    
-    #endif
 
     // Convenience method for generating PIF.
     public static func generatePIF(

Sources/Workspace/ManagedPrebuilt.swift

@@ -15,7 +15,6 @@ import struct TSCBasic.StringError
 
 import Basics
 import PackageModel
-import TSCBasic
 
 extension Workspace {
     /// A downloaded prebuilt managed by the workspace.
@@ -30,7 +29,7 @@ extension Workspace {
         public let libraryName: String
 
         /// The path to the extracted prebuilt artifacts
-        public let path: Basics.AbsolutePath
+        public let path: AbsolutePath
 
         /// The products in the library
         public let products: [String]

Tests/BuildTests/BuildPlanTraversalTests.swift

@@ -152,7 +152,6 @@ struct BuildPlanTraversalTests {
             #expect(description == nil)
         } onModule: { module, destination, description in
             moduleDependencies.append((module, destination, description))
-            return .continue
         }
 
         #expect(moduleDependencies.count == 2)

Tests/WorkspaceTests/PrebuiltsTests.swift

@@ -890,3 +890,13 @@ final class PrebuiltsTests: XCTestCase {
         }
     }
 }
+
+extension String {
+    var fixwin: String {
+        #if os(Windows)
+        return self.replacingOccurrences(of: "/", with: "\\")
+        #else
+        return self
+        #endif
+    }
+}

Utilities/build-using-self

@@ -163,7 +163,6 @@ def filterNone(items: t.Iterable) -> t.Iterable:
 
 def main() -> None:
     args = get_arguments()
-    ignore = "-Xlinker /ignore:4217" if os.name == "nt" else ""
     logging.getLogger().setLevel(logging.DEBUG if args.is_verbose else logging.INFO)
     logging.debug("Args: %r", args)
     ignore_args = ["-Xlinker", "/ignore:4217"] if os.name == "nt" else []