Rename CompoundPackageContainerProvider to CompositePackageContainerProvider

Author: mattt

Sources/PackageGraph/CompoundPackageContainerProvider.swift renamed to Sources/PackageGraph/CompositePackageContainerProvider.swift

@@ -18,7 +18,7 @@ import SourceControl
 import TSCBasic
 import TSCUtility
 
-public class CompoundPackageContainerProvider: PackageContainerProvider {
+public class CompositePackageContainerProvider: PackageContainerProvider {
     let manifestLoader: ManifestLoaderProtocol
     let repositoryManager: RepositoryManager
     let mirrors: DependencyMirrors

Sources/Workspace/Workspace.swift

@@ -299,7 +299,7 @@ public class Workspace {
         self.artifactsPath = self.dataPath.appending(component: "artifacts")
 
         if enablePackageRegistry {
-            self.containerProvider = CompoundPackageContainerProvider(
+            self.containerProvider = CompositePackageContainerProvider(
                 repositoryManager: repositoryManager,
                 mirrors: self.config.mirrors,
                 manifestLoader: manifestLoader,
@@ -858,7 +858,7 @@ extension Workspace {
                 // FIXME: We should probably just warn in case we fail to create
                 // this symlink, which could happen if there is some non-symlink
                 // entry at this location.
-                try fileSystem.createSymbolicLink(symLinkPath, pointingAt: path, relative: false)
+                try self.fileSystem.createSymbolicLink(symLinkPath, pointingAt: path, relative: false)
             }
         }
 
@@ -1179,7 +1179,7 @@ public extension Workspace {
                 return path
             case .remote:
                 let pathComponents = dependency.packageRef.identity.description.split(separator: "/", omittingEmptySubsequences: true)
-                return pathComponents.reduce(checkoutsPath) { (path, component) in
+                return pathComponents.reduce(self.checkoutsPath) { path, component in
                     path.appending(component: String(component))
                 }
             }
@@ -2053,7 +2053,7 @@ extension Workspace {
                     // If current state and new state are equal, we don't need
                     // to do anything.
                     let newState = CheckoutState(revision: revision, branch: branch)
-                    if case .checkout(let checkoutState) = currentDependency.state, checkoutState == newState {
+                    if case .checkout(let checkoutState) = currentDependency.state, self.checkoutState == newState {
                         packageStateChanges[packageRef.identity.description] = (packageRef, .unchanged)
                     } else {
                         // Otherwise, we need to update this dependency to this revision.
@@ -2067,7 +2067,7 @@ extension Workspace {
 
             case .version(let version):
                 if let currentDependency = currentDependency {
-                    if case .checkout(let checkoutState) = currentDependency.state, checkoutState.version == version {
+                    if case .checkout(let checkoutState) = currentDependency.state, self.checkoutState.version == version {
                         packageStateChanges[packageRef.identity.description] = (packageRef, .unchanged)
                     } else {
                         let newState = PackageStateChange.State(requirement: .version(version), products: products)
@@ -2341,7 +2341,7 @@ extension Workspace {
             let dependency = ManagedDependency.local(packageRef: package)
             self.state.dependencies.add(dependency)
             try self.state.saveState()
-            return path(for: dependency)
+            return self.path(for: dependency)
         }
 
         return try self.clone(package: package, at: checkoutState)
@@ -2359,7 +2359,7 @@ extension Workspace {
         // Note that we don't actually remove a local package from disk.
         switch dependency.state {
         case _ where dependency.packageRef.kind == .local:
-            fallthrough // FIXME
+            fallthrough // FIXME:
         case .local:
             self.state.dependencies.remove(forURL: package.identity.description)
             try self.state.saveState()