cleanup

Author: tomerd

Bar-1.2.3.zip

@@ -1333,14 +1333,7 @@ extension Workspace {
         }
 
         // optimization: preload in parallel
-        let rootDependencyManifestsURLs = root.dependencies.map{ dependency -> String in
-            switch dependency {
-            case .local(let data):
-                return data.path.pathString
-            case .git(let data):
-                return data.location
-            }
-        }
+        let rootDependencyManifestsURLs = root.dependencies.map{ $0.location }
         let rootDependencyManifests = try temp_await { self.loadManifests(forURLs: rootDependencyManifestsURLs, diagnostics: diagnostics, completion: $0) }
 
         let inputManifests = root.manifests + rootDependencyManifests
@@ -1353,34 +1346,15 @@ extension Workspace {
             let productFilter: ProductFilter
         }
 
-
         // optimization: preload manifest we know about in parallel
-        let inputDependenciesURLs = inputManifests.map { manifest in
-            //$0.dependencies.map{ config.mirrors.effectiveURL(forURL: $0.location) }
-            manifest.dependencies.map{ dependency -> String in
-                switch dependency {
-                case .local(let data):
-                    return data.path.pathString
-                case .git(let data):
-                    return data.location
-                }
-            }
-
-        }.flatMap { $0 }
+        let inputDependenciesURLs = inputManifests.map { $0.dependencies.map{ $0.location } }.flatMap { $0 }
         // FIXME: this should not block
         var loadedManifests = try temp_await { self.loadManifests(forURLs: inputDependenciesURLs, diagnostics: diagnostics, completion: $0) }.spm_createDictionary{ ($0.packageLocation, $0) }
 
         // continue to load the rest of the manifest for this graph
         let allManifestsWithPossibleDuplicates = try topologicalSort(inputManifests.map{ KeyedPair($0, key: URLAndFilter(url: $0.packageLocation, productFilter: .everything)) }) { node in
             return node.item.dependenciesRequired(for: node.key.productFilter).compactMap{ dependency in
-                //let url = config.mirrors.effectiveURL(forURL: dependency.location)
-                let location: String
-                switch dependency {
-                case .local(let data):
-                    location =  data.path.pathString
-                case .git(let data):
-                    location = data.location
-                }
+                let location = dependency.location
                 // FIXME: this should not block
                 // note: loadManifest emits diagnostics in case it fails
                 let manifest = loadedManifests[location] ?? temp_await { self.loadManifest(forURL: location, diagnostics: diagnostics, completion: $0) }
@@ -2635,3 +2609,16 @@ public final class LoadableResult<Value> {
         return try loadResult().get()
     }
 }
+
+// FIXME: the manifest loading logic should be changed to use identity instead of location once identity is unique
+// at that time we should remove this
+extension PackageDependencyDescription {
+    var location: String {
+        switch self {
+        case .local(let data):
+            return data.path.pathString
+        case .git(let data):
+            return data.location
+        }
+    }
+}