Minor cleanups

Author: MaxDesiatov

Sources/PackageGraph/PackageGraph+Loading.swift

@@ -381,6 +381,7 @@ private func createResolvedPackages(
             targetBuilder.dependencies += try targetBuilder.target.dependencies.compactMap { dependency in
                 switch dependency {
                 case .target(let target, let conditions):
+                    try targetBuilder.target.validateDependency(target: target)
                     guard let targetBuilder = targetMap[target] else {
                         throw InternalError("unknown target \(target.name)")
                     }
@@ -749,7 +750,6 @@ private func computePlatforms(
     package: Package,
     platformRegistry: PlatformRegistry
 ) -> [SupportedPlatform] {
-
     // the supported platforms as declared in the manifest
     let declaredPlatforms: [SupportedPlatform] = package.manifest.platforms.map { platform in
         let declaredPlatform = platformRegistry.platformByName[platform.platformName]
@@ -909,7 +909,6 @@ private final class ResolvedTargetBuilder: ResolvedBuilder<ResolvedTarget> {
         let dependencies = try self.dependencies.map { dependency -> ResolvedTarget.Dependency in
             switch dependency {
             case .target(let targetBuilder, let conditions):
-                try self.target.validateDependency(target: targetBuilder.target)
                 return .target(try targetBuilder.construct(), conditions: conditions)
             case .product(let productBuilder, let conditions):
                 try self.target.validateDependency(
@@ -949,7 +948,6 @@ extension Target {
 }
 /// Builder for resolved package.
 private final class ResolvedPackageBuilder: ResolvedBuilder<ResolvedPackage> {
-
     /// The package reference.
     let package: Package
 

Sources/PackageGraph/Resolution/ResolvedTarget.swift

@@ -14,7 +14,7 @@ import PackageModel
 
 import func TSCBasic.topologicalSort
 
-/// Represents a fully resolved target. All the dependencies for the target are resolved.
+/// Represents a fully resolved target. All the dependencies for this target are also stored as resolved.
 public struct ResolvedTarget: Hashable {
     /// Represents dependency of a resolved target.
     public enum Dependency: Hashable {

Sources/PackageModel/PlatformRegistry.swift

@@ -11,8 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 /// A registry for available platforms.
-public final class PlatformRegistry {
-
+public struct PlatformRegistry {
     /// The current registry is hardcoded and static so we can just use
     /// a singleton for now.
     public static let `default`: PlatformRegistry = .init()
@@ -31,6 +30,19 @@ public final class PlatformRegistry {
 
     /// The static list of known platforms.
     private static var _knownPlatforms: [Platform] {
-        return [.macOS, .macCatalyst, .iOS, .tvOS, .watchOS, .visionOS, .linux, .windows, .android, .wasi, .driverKit, .openbsd]
+        [
+            .macOS,
+            .macCatalyst,
+            .iOS,
+            .tvOS,
+            .watchOS,
+            .visionOS,
+            .linux,
+            .windows,
+            .android,
+            .wasi,
+            .driverKit,
+            .openbsd
+        ]
     }
 }