Merge pull request #554 from CodaFi/remember-me

Author: CodaFi

Sources/SwiftDriver/ExplicitModuleBuilds/ModuleDependencyScanning.swift

@@ -61,7 +61,7 @@ internal extension Driver {
     }
 
     // Pass on the input files
-    commandLine.append(contentsOf: inputFiles.map { .path($0.file)})
+    commandLine.append(contentsOf: inputFiles.map { .path($0.file) })
     return (inputs, commandLine)
   }
 

Sources/SwiftDriver/IncrementalCompilation/IncrementalCompilationState.swift

@@ -423,14 +423,12 @@ extension OutputFileMap {
 // MARK: SourceFiles
 @_spi(Testing) public struct SourceFiles {
   let currentInOrder: [TypedVirtualPath]
-  private let currentSet: Set<VirtualPath>
-  let previous: Set<VirtualPath>
+  private let previous: Set<VirtualPath>
   let disappeared: [VirtualPath]
 
   init(inputFiles: [TypedVirtualPath], buildRecord: BuildRecord?) {
     self.currentInOrder = inputFiles.filter {$0.type == .swift}
     let currentSet = Set(currentInOrder.map {$0.file} )
-    self.currentSet = currentSet
     self.previous = buildRecord.map {
       Set($0.inputInfos.keys)
     } ?? Set()

Sources/SwiftDriver/Jobs/EmitModuleJob.swift

@@ -59,10 +59,8 @@ extension Driver {
 
     commandLine.appendFlags("-frontend", "-emit-module", "-experimental-skip-non-inlinable-function-bodies-without-types")
 
-    let swiftInputFiles = inputFiles.filter { $0.type.isPartOfSwiftCompilation }
-
     // Add the inputs.
-    for input in swiftInputFiles {
+    for input in self.inputFiles where input.type.isPartOfSwiftCompilation {
       commandLine.append(.path(input.file))
       inputs.append(input)
     }