cleanup

Author: tomerd

Sources/Commands/SwiftTool.swift

@@ -1170,3 +1170,10 @@ extension SwiftToolOptions {
         }
     }
 }
+
+extension Workspace.ManagedDependency {
+    fileprivate var isEdited: Bool {
+        if case .edited = self.state { return true }
+        return false
+    }
+}

Sources/SPMTestSupport/MockWorkspace.swift

@@ -402,24 +402,34 @@ public final class MockWorkspace {
         check(ResolutionPrecomputationResult(result: result, diagnostics: observability.diagnostics))
     }
 
-    // TODO: expand to handler registry as well
     public func set(
         pins: [PackageReference: CheckoutState] = [:],
         managedDependencies: [Workspace.ManagedDependency] = [],
         managedArtifacts: [Workspace.ManagedArtifact] = []
+    ) throws {
+        let pins = pins.mapValues { checkoutState -> PinsStore.PinState in
+            switch checkoutState {
+            case .version(let version, let revision):
+                return .version(version, revision: revision.identifier)
+            case .branch(let name, let revision):
+                return .branch(name: name, revision: revision.identifier)
+            case.revision(let revision):
+                return .revision(revision.identifier)
+            }
+        }
+        try self.set(pins: pins, managedDependencies: managedDependencies, managedArtifacts: managedArtifacts)
+    }
+
+    public func set(
+        pins: [PackageReference: PinsStore.PinState] = [:],
+        managedDependencies: [Workspace.ManagedDependency] = [],
+        managedArtifacts: [Workspace.ManagedArtifact] = []
     ) throws {
         let workspace = try self.getOrCreateWorkspace()
         let pinsStore = try workspace.pinsStore.load()
 
         for (ref, state) in pins {
-            switch state {
-            case .version(let version, let revision):
-                pinsStore.pin(packageRef: ref, state: .version(version, revision: revision.identifier))
-            case .branch(let branch, let revision):
-                pinsStore.pin(packageRef: ref, state: .branch(name: branch, revision: revision.identifier))
-            case .revision(let revision):
-                pinsStore.pin(packageRef: ref, state: .revision(revision.identifier))
-            }
+            pinsStore.pin(packageRef: ref, state: state)
         }
 
         for dependency in managedDependencies {

Sources/Workspace/ManagedDependency.swift

@@ -59,18 +59,6 @@ extension Workspace {
         /// The state of the managed dependency.
         public let state: State
 
-        /// Returns true if state is a source control checkout.
-        var isSourceControl: Bool {
-            if case .sourceControl = self.state { return true }
-            return false
-        }
-
-        /// Returns true if the dependency is edited.
-        public var isEdited: Bool {
-            if case .edited = self.state { return true }
-            return false
-        }
-
         /// The checked out path of the dependency on disk, relative to the workspace checkouts path.
         public let subpath: RelativePath
 

Sources/Workspace/ResolverPrecomputationProvider.swift

@@ -167,6 +167,13 @@ private struct LocalPackageContainer: PackageContainer {
     }
 }
 
+private extension Workspace.ManagedDependency {
+    var isSourceControl: Bool {
+        if case .sourceControl = self.state { return true }
+        return false
+    }
+}
+
 private extension Workspace.ManagedDependency.State {
     var checkout: CheckoutState? {
         switch self {

Sources/Workspace/Workspace.swift

@@ -3111,28 +3111,6 @@ extension Workspace: PackageContainerProvider {
         }
     }
 
-    /// Retrieves the given `package` at a given `checkoutState`.
-    ///
-    /// - Parameters:
-    ///   - package: The package to retrieve.
-    ///   - checkoutState: The state to retrieve at.
-    /// - Returns: The path of the local copy of the package.
-    /*
-    func retrieve(package: PackageReference, at checkoutState: CheckoutState) throws -> AbsolutePath {
-        switch package.kind {
-        case .root, .fileSystem:
-            throw InternalError("local dependencies are supported")
-        case .localSourceControl, .remoteSourceControl:
-            return try self.checkoutRepository(package: package, at: checkoutState)
-        case .registry:
-            guard case .version(let version, _) = checkoutState else {
-                throw InternalError("cannot download source archive for package \(package) with checkout state \(checkoutState)")
-            }
-
-            return try self.downloadSourceArchive(for: package, at: version)
-        }
-    }*/
-
     /// Removes the clone and checkout of the provided specifier.
     ///
     /// - Parameters:

Tests/PackageGraphTests/PubgrubTests.swift

@@ -2232,22 +2232,6 @@ class DependencyGraphBuilder {
         self.containers[package] = container
     }
 
-    // backwards compatibility
-   /*
-    func create(pinsStore pins: [String: (CheckoutState, ProductFilter)]) -> PinsStore {
-        let pins = pins.mapValues { pair -> (PinsStore.PinState, ProductFilter) in
-            switch pair.0 {
-            case .version(let version, let revision):
-                return (.version(version, revision: revision.identifier), pair.1)
-            case .branch(let branch, let revision):
-                return (.branch(branch, revision: revision.identifier), pair.1)
-            case .revision(let revision):
-                return (.revision(revision.identifier), pair.1)
-            }
-        }
-        return self.create(pinsStore: pins)
-    }*/
-
     /// Creates a pins store with the given pins.
     func create(pinsStore pins: [String: (PinsStore.PinState, ProductFilter)]) -> PinsStore {
         let fs = InMemoryFileSystem()