Address feedback

Author: neonichu

Sources/SWBCore/Dependencies.swift

@@ -240,6 +240,11 @@ public struct DependencyValidationInfo: Hashable, Sendable, Codable {
     public struct Import: Hashable, Sendable, Codable {
         public let dependency: ModuleDependency
         public let importLocations: [Diagnostic.Location]
+
+        public init(dependency: ModuleDependency, importLocations: [Diagnostic.Location]) {
+            self.dependency = dependency
+            self.importLocations = importLocations
+        }
     }
 
     public enum Payload: Hashable, Sendable, Codable {
@@ -250,19 +255,7 @@ public struct DependencyValidationInfo: Hashable, Sendable, Codable {
 
     public let payload: Payload
 
-    public init(files: [Path]?) {
-        if let files {
-            self.payload = .clangDependencies(files: files.map { $0.str })
-        } else {
-            self.payload = .unsupported
-        }
-    }
-
-    public init(imports: [(ModuleDependency, importLocations: [SWBUtil.Diagnostic.Location])]?) {
-        if let imports {
-            self.payload = .swiftDependencies(imports: imports.map { Import(dependency: $0.0, importLocations: $0.importLocations) })
-        } else {
-            self.payload = .unsupported
-        }
+    public init(payload: Payload) {
+        self.payload = payload
     }
 }

Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift

@@ -273,27 +273,14 @@ public struct SwiftSourceFileIndexingInfo: SourceFileIndexingInfo {
     }
 }
 
-public struct SwiftDependencyValidationPayload: Serializable, Encodable, Sendable {
+public struct SwiftDependencyValidationPayload: SerializableCodable, Encodable, Sendable {
     public let dependencyValidationOutputPath: Path
     public let moduleDependenciesContext: ModuleDependenciesContext
 
     public init(dependencyValidationOutputPath: Path, moduleDependenciesContext: ModuleDependenciesContext) {
         self.dependencyValidationOutputPath = dependencyValidationOutputPath
         self.moduleDependenciesContext = moduleDependenciesContext
     }
-
-    public func serialize<T: Serializer>(to serializer: T) {
-        serializer.serializeAggregate(2) {
-            serializer.serialize(dependencyValidationOutputPath)
-            serializer.serialize(moduleDependenciesContext)
-        }
-    }
-
-    public init(from deserializer: any Deserializer) throws {
-        try deserializer.beginAggregate(2)
-        self.dependencyValidationOutputPath = try deserializer.deserialize()
-        self.moduleDependenciesContext = try deserializer.deserialize()
-    }
 }
 
 /// The minimal data we need to serialize to reconstruct `generatePreviewInfo`

Sources/SWBCore/SpecImplementations/Tools/ValidateDependencies.swift

@@ -44,21 +44,10 @@ public final class ValidateDependenciesSpec: CommandLineToolSpec, SpecImplementa
     }
 }
 
-public struct ValidateDependenciesPayload: TaskPayload, Sendable {
+public struct ValidateDependenciesPayload: TaskPayload, Sendable, SerializableCodable {
     public let moduleDependenciesContext: ModuleDependenciesContext
 
     public init(moduleDependenciesContext: ModuleDependenciesContext) {
         self.moduleDependenciesContext = moduleDependenciesContext
     }
-
-    public func serialize<T: Serializer>(to serializer: T) {
-        serializer.serializeAggregate(1) {
-            serializer.serialize(moduleDependenciesContext)
-        }
-    }
-
-    public init(from deserializer: any Deserializer) throws {
-        try deserializer.beginAggregate(1)
-        self.moduleDependenciesContext = try deserializer.deserialize()
-    }
 }

Sources/SWBTaskExecution/TaskActions/ClangCompileTaskAction.swift

@@ -325,22 +325,22 @@ public final class ClangCompileTaskAction: TaskAction, BuildValueValidatingTaskA
                 }
             }
 
-            if let moduleDependenciesContext, lastResult == .succeeded {
+            if lastResult == .succeeded {
                 // Verify the dependencies from the trace data.
-                let files: [Path]?
+                let payload: DependencyValidationInfo.Payload
                 if let traceFilePath {
                     let fs = executionDelegate.fs
                     let traceData = try JSONDecoder().decode(Array<TraceData>.self, from: Data(fs.read(traceFilePath)))
 
                     var allFiles = Set<Path>()
                     traceData.forEach { allFiles.formUnion(Set($0.includes)) }
-                    files = Array(allFiles)
+                    payload = .clangDependencies(files: allFiles.map { $0.str })
                 } else {
-                    files = nil
+                    payload = .unsupported
                 }
 
                 if let dependencyValidationOutputPath {
-                    let validationInfo = DependencyValidationInfo(files: files)
+                    let validationInfo = DependencyValidationInfo(payload: payload)
                     _ = try executionDelegate.fs.writeIfChanged(
                         dependencyValidationOutputPath,
                         contents: ByteString(

Sources/SWBTaskExecution/TaskActions/SwiftDriverTaskAction.swift

@@ -98,8 +98,13 @@ final public class SwiftDriverTaskAction: TaskAction, BuildValueValidatingTaskAc
             if driverPayload.explicitModulesEnabled,
                let dependencyValidationPayload = payload.dependencyValidationPayload
             {
-                let imports = try await dependencyGraph.mainModuleImportModuleDependencies(for: driverPayload.uniqueID)
-                let validationInfo = DependencyValidationInfo(imports: imports)
+                let payload: DependencyValidationInfo.Payload
+                if let imports = try await dependencyGraph.mainModuleImportModuleDependencies(for: driverPayload.uniqueID) {
+                    payload = .swiftDependencies(imports: imports.map { .init(dependency: $0.0, importLocations: $0.importLocations) })
+                } else {
+                    payload = .unsupported
+                }
+                let validationInfo = DependencyValidationInfo(payload: payload)
                 _ = try executionDelegate.fs.writeIfChanged(
                     dependencyValidationPayload.dependencyValidationOutputPath,
                     contents: ByteString(